Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 874b6a91 authored by Zhi Wang's avatar Zhi Wang Committed by Zhenyu Wang
Browse files

drm/i915/gvt: Rename intel_vgpu_{init, clean}_gvt_context() 



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: default avatarZhi Wang <zhi.a.wang@intel.com>
parent 54cff647

drivers/gpu/drm/i915/gvt/scheduler.c

+19 −2
Original line number Diff line number Diff line
@@ -709,12 +709,29 @@ int intel_gvt_init_workload_scheduler(struct intel_gvt *gvt) 
	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);

drivers/gpu/drm/i915/gvt/scheduler.h

+2 −2
Original line number Diff line number Diff line
@@ -137,9 +137,9 @@ void intel_gvt_clean_workload_scheduler(struct intel_gvt *gvt); 


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);

#endif

drivers/gpu/drm/i915/gvt/vgpu.c

+3 −3
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ void intel_gvt_destroy_vgpu(struct intel_vgpu *vgpu) 


	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_create_vgpu(struct intel_gvt *gvt, 
	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_create_vgpu(struct intel_gvt *gvt, 
	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: