diff options
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 13fae1c9dcc8..3fc286cd1157 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c | |||
| @@ -2822,7 +2822,7 @@ semaphore_wait_to_signaller_ring(struct intel_engine_cs *engine, u32 ipehr, | |||
| 2822 | if (engine == signaller) | 2822 | if (engine == signaller) |
| 2823 | continue; | 2823 | continue; |
| 2824 | 2824 | ||
| 2825 | if (offset == signaller->semaphore.signal_ggtt[engine->id]) | 2825 | if (offset == signaller->semaphore.signal_ggtt[engine->hw_id]) |
| 2826 | return signaller; | 2826 | return signaller; |
| 2827 | } | 2827 | } |
| 2828 | } else { | 2828 | } else { |
| @@ -2832,13 +2832,13 @@ semaphore_wait_to_signaller_ring(struct intel_engine_cs *engine, u32 ipehr, | |||
| 2832 | if(engine == signaller) | 2832 | if(engine == signaller) |
| 2833 | continue; | 2833 | continue; |
| 2834 | 2834 | ||
| 2835 | if (sync_bits == signaller->semaphore.mbox.wait[engine->id]) | 2835 | if (sync_bits == signaller->semaphore.mbox.wait[engine->hw_id]) |
| 2836 | return signaller; | 2836 | return signaller; |
| 2837 | } | 2837 | } |
| 2838 | } | 2838 | } |
| 2839 | 2839 | ||
| 2840 | DRM_DEBUG_DRIVER("No signaller ring found for ring %i, ipehr 0x%08x, offset 0x%016llx\n", | 2840 | DRM_DEBUG_DRIVER("No signaller ring found for %s, ipehr 0x%08x, offset 0x%016llx\n", |
| 2841 | engine->id, ipehr, offset); | 2841 | engine->name, ipehr, offset); |
| 2842 | 2842 | ||
| 2843 | return ERR_PTR(-ENODEV); | 2843 | return ERR_PTR(-ENODEV); |
| 2844 | } | 2844 | } |