diff options
| author | 宋文武 <iyzsong@gmail.com> | 2015-04-08 16:04:37 +0800 |
|---|---|---|
| committer | 宋文武 <iyzsong@gmail.com> | 2015-04-08 16:04:37 +0800 |
| commit | cf3e3e374c4bd1c9f0f976fc8f02f66aff6417dc (patch) | |
| tree | b4ce7938c855781af2e0a1e68b3588f96de7e7e1 /gnu/packages/patches/linux-libre-libreboot-fix.patch | |
| parent | 4ae7559fd62c03a800b010c228639f18b9f58006 (diff) | |
| parent | 068a53c36dec5ace42cc3ea89060d9a485592f08 (diff) | |
| download | guix-cf3e3e374c4bd1c9f0f976fc8f02f66aff6417dc.tar guix-cf3e3e374c4bd1c9f0f976fc8f02f66aff6417dc.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/linux-libre-libreboot-fix.patch')
| -rw-r--r-- | gnu/packages/patches/linux-libre-libreboot-fix.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/gnu/packages/patches/linux-libre-libreboot-fix.patch b/gnu/packages/patches/linux-libre-libreboot-fix.patch new file mode 100644 index 0000000000..d340a99fcb --- /dev/null +++ b/gnu/packages/patches/linux-libre-libreboot-fix.patch @@ -0,0 +1,37 @@ +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)) { |