drm/i915/gt: Remove errant assertion in __intel_context_do_pin
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 20 May 2020 07:30:48 +0000 (08:30 +0100)
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Mon, 25 May 2020 12:40:31 +0000 (15:40 +0300)
This assertion was removed in commit 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")
References: b412c63f1cba ("drm/i915/gt: Report context-is-closed prior to pinning")
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>
Link: https://patchwork.freedesktop.org/patch/msgid/20200520073048.2394034-1-chris@chris-wilson.co.uk
(cherry picked from commit f2c1061a3677b400a945d9238f17bf33d669acff)
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
drivers/gpu/drm/i915/gt/intel_context.c

index 74ddb49b29415503b992b0696b4e59a57fa4373b..e4aece20bc8089b0cff67256c12f0e7153ea2294 100644 (file)
@@ -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)