Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 974a3b0f authored Sep 09, 2012 by Daniel Vetter

drm/i915: set the right gen3 flip_done mode also at resume



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.

Cc: stable@vger.kernel.org (for 3.5 only)
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 99d0b1db

drivers/gpu/drm/i915/i915_irq.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -2700,9 +2700,6 @@ void intel_irq_init(struct drm_device *dev)
		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;

drivers/gpu/drm/i915/intel_pm.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -3672,6 +3672,9 @@ static void gen3_init_clock_gating(struct drm_device *dev)

		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)