drm/i915/gt: Remove errant assertion in __intel_context_do_pin
diff mbox series

Message ID 20200520073048.2394034-1-chris@chris-wilson.co.uk
State New
Headers show
Series
  • drm/i915/gt: Remove errant assertion in __intel_context_do_pin
Related show

Commit Message

Chris Wilson May 20, 2020, 7:30 a.m. UTC
This assertion was removed in b412c63f1cba ("drm/i915/gt: Report
context-is-closed prior to pinning"), but accidentally restored by a
cherry-pick into drm-next and now has percolated back to
drm-intel-next-queued.

Fixes: 2e46a2a0b014 ("drm/i915: Use explicit flag to mark unreachable intel_context")
Fixes: 2b703bbda271 ("Merge drm/drm-next into drm-intel-next-queued")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
---
 drivers/gpu/drm/i915/gt/intel_context.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Joonas Lahtinen May 20, 2020, 10:51 a.m. UTC | #1
Quoting Chris Wilson (2020-05-20 10:30:48)
> This assertion was removed in b412c63f1cba ("drm/i915/gt: Report
> context-is-closed prior to pinning"), but accidentally restored by a
> cherry-pick into drm-next and now has percolated back to
> drm-intel-next-queued.
> 
> Fixes: 2e46a2a0b014 ("drm/i915: Use explicit flag to mark unreachable intel_context")
> Fixes: 2b703bbda271 ("Merge drm/drm-next into drm-intel-next-queued")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

Regards, Joonas

> ---
>  drivers/gpu/drm/i915/gt/intel_context.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c
> index 74ddb49b2941..e4aece20bc80 100644
> --- a/drivers/gpu/drm/i915/gt/intel_context.c
> +++ b/drivers/gpu/drm/i915/gt/intel_context.c
> @@ -97,8 +97,6 @@ int __intel_context_do_pin(struct intel_context *ce)
>  {
>         int err;
>  
> -       GEM_BUG_ON(intel_context_is_closed(ce));
> -
>         if (unlikely(!test_bit(CONTEXT_ALLOC_BIT, &ce->flags))) {
>                 err = intel_context_alloc_state(ce);
>                 if (err)
> -- 
> 2.27.0.rc0
>

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c
index 74ddb49b2941..e4aece20bc80 100644
--- a/drivers/gpu/drm/i915/gt/intel_context.c
+++ b/drivers/gpu/drm/i915/gt/intel_context.c
@@ -97,8 +97,6 @@  int __intel_context_do_pin(struct intel_context *ce)
 {
 	int err;
 
-	GEM_BUG_ON(intel_context_is_closed(ce));
-
 	if (unlikely(!test_bit(CONTEXT_ALLOC_BIT, &ce->flags))) {
 		err = intel_context_alloc_state(ce);
 		if (err)