Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ec6a890dfed7dd245beba5e5bcdfcffbd934c284

Authored by Chris Wilson
Committed by Keith Packard
1 parent efc2924e73
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

drm/i915: Apply HWSTAM workaround for BSD ring on SandyBridge 

...we need to apply exactly the same workaround for missing interrupts
from BSD as for the BLT ring, apparently.

See also commit 498e720b96379d8ee9c294950a01534a73defcf3
(drm/i915: Fix gen6 (SNB) missed BLT ring interrupts).

Reported-and-tested-by: nkalkhof@web.de
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38529
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>

Showing 2 changed files with 2 additions and 0 deletions Side-by-side Diff

drivers/gpu/drm/i915/i915_irq.c
Diff comments   View file @ ec6a890
... ... @@ -1749,6 +1749,7 @@
1749 1749 * happens.
1750 1750 */
1751 1751 I915_WRITE(GEN6_BLITTER_HWSTAM, ~GEN6_BLITTER_USER_INTERRUPT);
  1752 + I915_WRITE(GEN6_BSD_HWSTAM, ~GEN6_BSD_USER_INTERRUPT);
1752 1753 }
1753 1754  
1754 1755 /* XXX hotplug from PCH */
drivers/gpu/drm/i915/i915_reg.h
Diff comments   View file @ ec6a890
... ... @@ -531,6 +531,7 @@
531 531 #define GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_ENABLE 0
532 532 #define GEN6_BSD_SLEEP_PSMI_CONTROL_IDLE_INDICATOR (1 << 3)
533 533  
  534 +#define GEN6_BSD_HWSTAM 0x12098
534 535 #define GEN6_BSD_IMR 0x120a8
535 536 #define GEN6_BSD_USER_INTERRUPT (1 << 12)
536 537