Re: [Intel-gfx] [PATCH] drm/i915: set the right gen3 flip_done mode also at resume

2012-09-10 Thread Daniel Vetter 
On Sun, Sep 09, 2012 at 12:23:05PM +0100, Chris Wilson wrote:
 On Sun,  9 Sep 2012 11:54:16 +0200, Daniel Vetter daniel.vet...@ffwll.ch 
 wrote:
  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: sta...@vger.kernel.org (for 3.5 only)
  Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch
 Reviewed-by: Chris Wilson ch...@chris-wilson.co.uk
Picked up for -fixes, thanks for the review.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH] drm/i915: set the right gen3 flip_done mode also at resume

2012-09-09 Thread Daniel Vetter 
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: sta...@vger.kernel.org (for 3.5 only)
Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch
---
 drivers/gpu/drm/i915/i915_irq.c | 3 ---
 drivers/gpu/drm/i915/intel_pm.c | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index bcb2624..71688fc 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2774,9 +2774,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;
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 36c6409..99ef6d2 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3723,6 +3723,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)
-- 
1.7.11.2

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915: set the right gen3 flip_done mode also at resume

2012-09-09 Thread Chris Wilson 
On Sun,  9 Sep 2012 11:54:16 +0200, Daniel Vetter daniel.vet...@ffwll.ch 
wrote:
 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: sta...@vger.kernel.org (for 3.5 only)
 Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch
Reviewed-by: Chris Wilson ch...@chris-wilson.co.uk
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx