This is a note to let you know that I've just added the patch titled
drm/i915: set the right gen3 flip_done mode also at resume
to the 3.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-i915-set-the-right-gen3-flip_done-mode-also-at-resume.patch
and it can be found in the queue-3.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 974a3b0f9f05b748fe11f1afc31efc32aa5160cb Mon Sep 17 00:00:00 2001
From: Daniel Vetter <[email protected]>
Date: Sun, 9 Sep 2012 11:54:16 +0200
Subject: drm/i915: set the right gen3 flip_done mode also at resume
From: Daniel Vetter <[email protected]>
commit 974a3b0f9f05b748fe11f1afc31efc32aa5160cb upstream.
Currently we've only frobbed this bit at irq_init time, but did
not restore it at resume time. Move it to the gen3 clock gating
function to fix this.
Notice while reading through code.
Reviewed-by: Chris Wilson <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/gpu/drm/i915/i915_irq.c | 3 ---
drivers/gpu/drm/i915/intel_pm.c | 3 +++
2 files changed, 3 insertions(+), 3 deletions(-)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2626,9 +2626,6 @@ void intel_irq_init(struct drm_device *d
dev->driver->irq_handler = i8xx_irq_handler;
dev->driver->irq_uninstall = i8xx_irq_uninstall;
} else if (INTEL_INFO(dev)->gen == 3) {
- /* IIR "flip pending" means done if this bit is set */
- I915_WRITE(ECOSKPD, _MASKED_BIT_DISABLE(ECO_FLIP_DONE));
-
dev->driver->irq_preinstall = i915_irq_preinstall;
dev->driver->irq_postinstall = i915_irq_postinstall;
dev->driver->irq_uninstall = i915_irq_uninstall;
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3528,6 +3528,9 @@ static void gen3_init_clock_gating(struc
if (IS_PINEVIEW(dev))
I915_WRITE(ECOSKPD, _MASKED_BIT_ENABLE(ECO_GATING_CX_ONLY));
+
+ /* IIR "flip pending" means done if this bit is set */
+ I915_WRITE(ECOSKPD, _MASKED_BIT_DISABLE(ECO_FLIP_DONE));
}
static void i85x_init_clock_gating(struct drm_device *dev)
Patches currently in stable-queue which might be from [email protected] are
queue-3.5/drm-i915-hdmi-clear-audio-enable-bit-for-hot-plug.patch
queue-3.5/drm-i915-extract-connector-update-from-intel_ddc_get_modes-for-reuse.patch
queue-3.5/drm-i915-use-hsw-rps-tuning-values-everywhere-on-gen6.patch
queue-3.5/drm-i915-fall-back-to-bit-banging-if-gmbus-fails-in-crt-edid-reads.patch
queue-3.5/drm-i915-enable-lvds-pin-pairs-before-dpll-on-gen2.patch
queue-3.5/drm-i915-set-the-right-gen3-flip_done-mode-also-at-resume.patch
queue-3.5/drm-i915-reduce-a-pin-leak-bug-into-a-warn.patch
queue-3.5/drm-i915-fix-wrong-order-of-parameters-in-port-checking.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
