38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
|
This patch fixes linux-libre-3.19.x on Libreboot X60 machines.
|
||
|
|
Copied from https://bugzilla.kernel.org/show_bug.cgi?id=93171#c25
|
||
|
|
|
||
|
|
--- a/drivers/gpu/drm/i915/i915_irq.c
|
||
|
|
+++ a/drivers/gpu/drm/i915/i915_irq.c
|
||
|
|
@@ -3598,14 +3598,12 @@ static int i8xx_irq_postinstall(struct drm_device *dev)
|
||
|
|
~(I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
|
||
|
|
I915_DISPLAY_PIPE_B_EVENT_INTERRUPT |
|
||
|
|
I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
|
||
|
|
- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT |
|
||
|
|
- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT);
|
||
|
|
+ I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT);
|
||
|
|
I915_WRITE16(IMR, dev_priv->irq_mask);
|
||
|
|
|
||
|
|
I915_WRITE16(IER,
|
||
|
|
I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
|
||
|
|
I915_DISPLAY_PIPE_B_EVENT_INTERRUPT |
|
||
|
|
- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT |
|
||
|
|
I915_USER_INTERRUPT);
|
||
|
|
POSTING_READ16(IER);
|
||
|
|
|
||
|
|
@@ -3767,14 +3765,12 @@ static int i915_irq_postinstall(struct drm_device *dev)
|
||
|
|
I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
|
||
|
|
I915_DISPLAY_PIPE_B_EVENT_INTERRUPT |
|
||
|
|
I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
|
||
|
|
- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT |
|
||
|
|
- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT);
|
||
|
|
+ I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT);
|
||
|
|
|
||
|
|
enable_mask =
|
||
|
|
I915_ASLE_INTERRUPT |
|
||
|
|
I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
|
||
|
|
I915_DISPLAY_PIPE_B_EVENT_INTERRUPT |
|
||
|
|
- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT |
|
||
|
|
I915_USER_INTERRUPT;
|
||
|
|
|
||
|
|
if (I915_HAS_HOTPLUG(dev)) {
|