From 874b6a910e6cc094629bd2634d14061cf5eb7690 Mon Sep 17 00:00:00 2001 From: Zhi Wang Date: Sun, 10 Sep 2017 20:08:18 +0800 Subject: [PATCH] drm/i915/gvt: Rename intel_vgpu_{init, clean}_gvt_context() Git-commit: 874b6a910e6cc094629bd2634d14061cf5eb7690 Patch-mainline: v4.16-rc1 References: FATE#322643 bsc#1055900 To move workload related functions into scheduler.c, an expected way is to collect all the init/clean functions related to vGPU workload submission into fewer functions. Rename intel_vgpu_{init, clean}_gvt_context() for above usage in future. Signed-off-by: Zhi Wang Acked-by: Takashi Iwai --- drivers/gpu/drm/i915/gvt/scheduler.c | 21 +++++++++++++++++++-- drivers/gpu/drm/i915/gvt/scheduler.h | 4 ++-- drivers/gpu/drm/i915/gvt/vgpu.c | 6 +++--- 3 files changed, 24 insertions(+), 7 deletions(-) --- a/drivers/gpu/drm/i915/gvt/scheduler.c +++ b/drivers/gpu/drm/i915/gvt/scheduler.c @@ -743,12 +743,29 @@ err: return ret; } -void intel_vgpu_clean_gvt_context(struct intel_vgpu *vgpu) +/** + * intel_vgpu_clean_submission - free submission-related resource for vGPU + * @vgpu: a vGPU + * + * This function is called when a vGPU is being destroyed. + * + */ +void intel_vgpu_clean_submission(struct intel_vgpu *vgpu) { i915_gem_context_put(vgpu->shadow_ctx); } -int intel_vgpu_init_gvt_context(struct intel_vgpu *vgpu) +/** + * intel_vgpu_setup_submission - setup submission-related resource for vGPU + * @vgpu: a vGPU + * + * This function is called when a vGPU is being created. + * + * Returns: + * Zero on success, negative error code if failed. + * + */ +int intel_vgpu_setup_submission(struct intel_vgpu *vgpu) { atomic_set(&vgpu->running_workload_num, 0); --- a/drivers/gpu/drm/i915/gvt/scheduler.h +++ b/drivers/gpu/drm/i915/gvt/scheduler.h @@ -137,9 +137,9 @@ void intel_gvt_clean_workload_scheduler( void intel_gvt_wait_vgpu_idle(struct intel_vgpu *vgpu); -int intel_vgpu_init_gvt_context(struct intel_vgpu *vgpu); +int intel_vgpu_setup_submission(struct intel_vgpu *vgpu); -void intel_vgpu_clean_gvt_context(struct intel_vgpu *vgpu); +void intel_vgpu_clean_submission(struct intel_vgpu *vgpu); void release_shadow_wa_ctx(struct intel_shadow_wa_ctx *wa_ctx); --- a/drivers/gpu/drm/i915/gvt/vgpu.c +++ b/drivers/gpu/drm/i915/gvt/vgpu.c @@ -254,7 +254,7 @@ void intel_gvt_destroy_vgpu(struct intel idr_remove(&gvt->vgpu_idr, vgpu->id); intel_vgpu_clean_sched_policy(vgpu); - intel_vgpu_clean_gvt_context(vgpu); + intel_vgpu_clean_submission(vgpu); intel_vgpu_clean_execlist(vgpu); intel_vgpu_clean_display(vgpu); intel_vgpu_clean_opregion(vgpu); @@ -376,7 +376,7 @@ static struct intel_vgpu *__intel_gvt_cr if (ret) goto out_clean_display; - ret = intel_vgpu_init_gvt_context(vgpu); + ret = intel_vgpu_setup_submission(vgpu); if (ret) goto out_clean_execlist; @@ -389,7 +389,7 @@ static struct intel_vgpu *__intel_gvt_cr return vgpu; out_clean_shadow_ctx: - intel_vgpu_clean_gvt_context(vgpu); + intel_vgpu_clean_submission(vgpu); out_clean_execlist: intel_vgpu_clean_execlist(vgpu); out_clean_display: