summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Chauvet <kwizart@gmail.com>2014-07-28 18:11:35 +0200
committerNicolas Chauvet <kwizart@gmail.com>2014-08-09 22:11:39 +0200
commitbcb884e1b30ac6efcfe26f62a0e93c7108aa3222 (patch)
treea8e4e9cd9dd1feb4e1042495593ccdac6081550d
parentbd19a3898abf2154a55448d07418b8edff094be2 (diff)
downloadkernel-bcb884e1b30ac6efcfe26f62a0e93c7108aa3222.tar.gz
kernel-bcb884e1b30ac6efcfe26f62a0e93c7108aa3222.tar.xz
kernel-bcb884e1b30ac6efcfe26f62a0e93c7108aa3222.zip
Fixup drm_fb-helper.patch
-rw-r--r--linux-arm-tagr-01_04-drm_fb-helper.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-arm-tagr-01_04-drm_fb-helper.patch b/linux-arm-tagr-01_04-drm_fb-helper.patch
index 4f882e9d..4204643d 100644
--- a/linux-arm-tagr-01_04-drm_fb-helper.patch
+++ b/linux-arm-tagr-01_04-drm_fb-helper.patch
@@ -96,13 +96,13 @@ diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 6eb45ac7a7d5..b0955fffca98 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
-@@ -521,7 +521,6 @@ static int i915_drm_freeze(struct drm_device *dev)
+@@ -527,7 +527,6 @@ static int i915_drm_freeze(struct drm_device *dev)
}
- intel_runtime_pm_disable_interrupts(dev);
+ drm_irq_uninstall(dev);
- dev_priv->enable_hotplug_processing = false;
- intel_suspend_gt_powersave(dev);
+ intel_disable_gt_powersave(dev);
@@ -659,7 +658,6 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings)
* notifications.