Revert "drm/i915/gvt: set max priority for gvt context"

Submitted by Weinan Li on March 21, 2018, 2:11 a.m.

Details

Message ID 1521598292-1787-1-git-send-email-weinan.z.li@intel.com
State New
Headers show
Series "Revert "drm/i915/gvt: set max priority for gvt context"" ( rev: 1 ) in Intel GVT devel

Not browsing as part of any series.

Commit Message

Weinan Li March 21, 2018, 2:11 a.m.
This reverts commit 11474e9091cf2002e948647fd9f63a7f027e488a.

Now host preemption can be enabled. Depends on commit:

commit 37ad4e687830 ("drm/i915/gvt: add 0xe4f0 into gen9 render list")

commit cd7e61b93d06 ("drm/i915/gvt: init mmio by lri command in vgpu
inhibit context")

commit 702791f7f204 ("drm/i915: add schedule out notification of preempted
but completed request")

Signed-off-by: Weinan Li <weinan.z.li@intel.com>

Conflicts:
	drivers/gpu/drm/i915/gvt/scheduler.c
---
 drivers/gpu/drm/i915/gvt/scheduler.c | 3 ---
 1 file changed, 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c
index 638abe8..d71e3de 100644
--- a/drivers/gpu/drm/i915/gvt/scheduler.c
+++ b/drivers/gpu/drm/i915/gvt/scheduler.c
@@ -1134,9 +1134,6 @@  int intel_vgpu_setup_submission(struct intel_vgpu *vgpu)
 	if (IS_ERR(s->shadow_ctx))
 		return PTR_ERR(s->shadow_ctx);
 
-	if (HAS_LOGICAL_RING_PREEMPTION(vgpu->gvt->dev_priv))
-		s->shadow_ctx->priority = INT_MAX;
-
 	bitmap_zero(s->shadow_ctx_desc_updated, I915_NUM_ENGINES);
 
 	s->workloads = kmem_cache_create_usercopy("gvt-g_vgpu_workload",

Comments

On 2018.03.21 10:11:32 +0800, Weinan Li wrote:
> This reverts commit 11474e9091cf2002e948647fd9f63a7f027e488a.
> 
> Now host preemption can be enabled. Depends on commit:
> 
> commit 37ad4e687830 ("drm/i915/gvt: add 0xe4f0 into gen9 render list")
> 
> commit cd7e61b93d06 ("drm/i915/gvt: init mmio by lri command in vgpu
> inhibit context")
> 
> commit 702791f7f204 ("drm/i915: add schedule out notification of preempted
> but completed request")
> 
> Signed-off-by: Weinan Li <weinan.z.li@intel.com>
> 
> Conflicts:
> 	drivers/gpu/drm/i915/gvt/scheduler.c

Could you remove this conflict in message? And  elaborate more about why
we can revert this now instead of just listing commit-ids...

> ---
>  drivers/gpu/drm/i915/gvt/scheduler.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c
> index 638abe8..d71e3de 100644
> --- a/drivers/gpu/drm/i915/gvt/scheduler.c
> +++ b/drivers/gpu/drm/i915/gvt/scheduler.c
> @@ -1134,9 +1134,6 @@ int intel_vgpu_setup_submission(struct intel_vgpu *vgpu)
>  	if (IS_ERR(s->shadow_ctx))
>  		return PTR_ERR(s->shadow_ctx);
>  
> -	if (HAS_LOGICAL_RING_PREEMPTION(vgpu->gvt->dev_priv))
> -		s->shadow_ctx->priority = INT_MAX;
> -
>  	bitmap_zero(s->shadow_ctx_desc_updated, I915_NUM_ENGINES);
>  
>  	s->workloads = kmem_cache_create_usercopy("gvt-g_vgpu_workload",
> -- 
> 1.9.1
> 
> _______________________________________________
> intel-gvt-dev mailing list
> intel-gvt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gvt-dev