drm/i915/gt: Drop a defunct timeline assertion
diff mbox series

Message ID 20200107143826.3298401-1-chris@chris-wilson.co.uk
State New
Headers show
Series
  • drm/i915/gt: Drop a defunct timeline assertion
Related show

Commit Message

Chris Wilson Jan. 7, 2020, 2:38 p.m. UTC
intel_timeline_enter() has been decoupled from intel_timeline_pin() and
both enter/exit & pin/unpin are allowed [read expected] to run
concurrently with one another. The assertion that they had better not is
stale.

Closes: https://gitlab.freedesktop.org/drm/intel/issues/940
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/gt/intel_timeline.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Mika Kuoppala Jan. 9, 2020, 8:14 a.m. UTC | #1
Chris Wilson <chris@chris-wilson.co.uk> writes:

> intel_timeline_enter() has been decoupled from intel_timeline_pin() and
> both enter/exit & pin/unpin are allowed [read expected] to run
> concurrently with one another. The assertion that they had better not is
> stale.
>
> Closes: https://gitlab.freedesktop.org/drm/intel/issues/940

Hmm I got page not found for this even tho other issues are shown :O

References to the decoupling part?

-Mika

> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
>  drivers/gpu/drm/i915/gt/intel_timeline.c | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_timeline.c b/drivers/gpu/drm/i915/gt/intel_timeline.c
> index ee5dc4fbdeb9..87716529cd2f 100644
> --- a/drivers/gpu/drm/i915/gt/intel_timeline.c
> +++ b/drivers/gpu/drm/i915/gt/intel_timeline.c
> @@ -348,7 +348,6 @@ void intel_timeline_enter(struct intel_timeline *tl)
>  	 * use atomic to manipulate tl->active_count.
>  	 */
>  	lockdep_assert_held(&tl->mutex);
> -	GEM_BUG_ON(!atomic_read(&tl->pin_count));
>  
>  	if (atomic_add_unless(&tl->active_count, 1, 0))
>  		return;
> -- 
> 2.25.0.rc1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Chris Wilson Jan. 9, 2020, 8:19 a.m. UTC | #2
Quoting Mika Kuoppala (2020-01-09 08:14:21)
> Chris Wilson <chris@chris-wilson.co.uk> writes:
> 
> > intel_timeline_enter() has been decoupled from intel_timeline_pin() and
> > both enter/exit & pin/unpin are allowed [read expected] to run
> > concurrently with one another. The assertion that they had better not is
> > stale.
> >
> > Closes: https://gitlab.freedesktop.org/drm/intel/issues/940
> 
> Hmm I got page not found for this even tho other issues are shown :O

You need to login for this one.

> References to the decoupling part?

References: a6edbca74b30 ("drm/i915/gt: Close race between engine_park and intel_gt_retire_requests")
-Chris
Mika Kuoppala Jan. 9, 2020, 8:30 a.m. UTC | #3
Chris Wilson <chris@chris-wilson.co.uk> writes:

> Quoting Mika Kuoppala (2020-01-09 08:14:21)
>> Chris Wilson <chris@chris-wilson.co.uk> writes:
>> 
>> > intel_timeline_enter() has been decoupled from intel_timeline_pin() and
>> > both enter/exit & pin/unpin are allowed [read expected] to run
>> > concurrently with one another. The assertion that they had better not is
>> > stale.
>> >
>> > Closes: https://gitlab.freedesktop.org/drm/intel/issues/940
>> 
>> Hmm I got page not found for this even tho other issues are shown :O
>
> You need to login for this one.
>
>> References to the decoupling part?
>
> References: a6edbca74b30 ("drm/i915/gt: Close race between engine_park and intel_gt_retire_requests")

Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/gt/intel_timeline.c b/drivers/gpu/drm/i915/gt/intel_timeline.c
index ee5dc4fbdeb9..87716529cd2f 100644
--- a/drivers/gpu/drm/i915/gt/intel_timeline.c
+++ b/drivers/gpu/drm/i915/gt/intel_timeline.c
@@ -348,7 +348,6 @@  void intel_timeline_enter(struct intel_timeline *tl)
 	 * use atomic to manipulate tl->active_count.
 	 */
 	lockdep_assert_held(&tl->mutex);
-	GEM_BUG_ON(!atomic_read(&tl->pin_count));
 
 	if (atomic_add_unless(&tl->active_count, 1, 0))
 		return;