Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos

1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 5874716774a7..19e94c3edc19 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -1545,6 +1545,16 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc)
 
         DRM_DEBUG_KMS("FIFO watermarks - A: %d, B: %d\n", planea_wm, planeb_wm);
 
+        if (IS_I915GM(dev) && enabled) {
+                struct intel_framebuffer *fb;
+
+                fb = to_intel_framebuffer(enabled->primary->fb);
+
+                /* self-refresh seems busted with untiled */
+                if (fb->obj->tiling_mode == I915_TILING_NONE)
+                        enabled = NULL;
+        }
+
         /*
          * Overlay gets an aggressive default since video jitter is bad.
          */