Re: [Intel-gfx] [PATCH 2/2] drm/i915/gt: Save/restore interrupts around breadcrumb disable

2019-08-13 Thread Mika Kuoppala
Chris Wilson  writes:

> Stop assuming we only get called with irqs-on for disarming the
> breadcrumbs, and do a full save/restore spin_lock_irq.
>
> Signed-off-by: Chris Wilson 
> Cc: Mika Kuoppala 

perf timer, drop ref, engine_unpark, disable_breadcrumbs
with irqs off.

Well, the trace on previous patch makes it clear,
for those who know the code...I had to read.

Reviewed-by: Mika Kuoppala 

> ---
>  drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c 
> b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
> index 15bbdd8c7552..2bc9c460e78d 100644
> --- a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
> +++ b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
> @@ -67,14 +67,15 @@ static void __intel_breadcrumbs_disarm_irq(struct 
> intel_breadcrumbs *b)
>  void intel_engine_disarm_breadcrumbs(struct intel_engine_cs *engine)
>  {
>   struct intel_breadcrumbs *b = >breadcrumbs;
> + unsigned long flags;
>  
>   if (!b->irq_armed)
>   return;
>  
> - spin_lock_irq(>irq_lock);
> + spin_lock_irqsave(>irq_lock, flags);
>   if (b->irq_armed)
>   __intel_breadcrumbs_disarm_irq(b);
> - spin_unlock_irq(>irq_lock);
> + spin_unlock_irqrestore(>irq_lock, flags);
>  }
>  
>  static inline bool __request_completed(const struct i915_request *rq)
> -- 
> 2.23.0.rc1
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 2/2] drm/i915/gt: Save/restore interrupts around breadcrumb disable

2019-08-13 Thread Chris Wilson
Stop assuming we only get called with irqs-on for disarming the
breadcrumbs, and do a full save/restore spin_lock_irq.

Signed-off-by: Chris Wilson 
Cc: Mika Kuoppala 
---
 drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c 
b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
index 15bbdd8c7552..2bc9c460e78d 100644
--- a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
+++ b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
@@ -67,14 +67,15 @@ static void __intel_breadcrumbs_disarm_irq(struct 
intel_breadcrumbs *b)
 void intel_engine_disarm_breadcrumbs(struct intel_engine_cs *engine)
 {
struct intel_breadcrumbs *b = >breadcrumbs;
+   unsigned long flags;
 
if (!b->irq_armed)
return;
 
-   spin_lock_irq(>irq_lock);
+   spin_lock_irqsave(>irq_lock, flags);
if (b->irq_armed)
__intel_breadcrumbs_disarm_irq(b);
-   spin_unlock_irq(>irq_lock);
+   spin_unlock_irqrestore(>irq_lock, flags);
 }
 
 static inline bool __request_completed(const struct i915_request *rq)
-- 
2.23.0.rc1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx