From 4905f718dd36d3b3dd3b36037f061d479563d4b8 Mon Sep 17 00:00:00 2001 From: Paulo Zanoni Date: Fri, 22 Mar 2013 14:16:38 -0300 Subject: [PATCH] --- yaml --- r: 371475 b: refs/heads/master c: f7708f78bd51a46abf00ae22ebb1b7deb594fc62 h: refs/heads/master i: 371473: 5b56d02a0dcd61c0330b464c3ac8ed5c12ad368c 371471: 8b8f929ddb28a403ee251b30990eca6d12957a37 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7ad90bb189fe..5e78810899e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15d199ea1f3e2b960b0efccca2cdd0ba40a31f3c +refs/heads/master: f7708f78bd51a46abf00ae22ebb1b7deb594fc62 diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index 236d268d809c..51871c248d6d 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/trunk/drivers/gpu/drm/i915/intel_display.c @@ -3599,9 +3599,13 @@ static void haswell_crtc_disable(struct drm_crtc *crtc) intel_ddi_disable_transcoder_func(dev_priv, cpu_transcoder); - /* Disable PF */ - I915_WRITE(PF_CTL(pipe), 0); - I915_WRITE(PF_WIN_SZ(pipe), 0); + /* XXX: Once we have proper panel fitter state tracking implemented with + * hardware state read/check support we should switch to only disable + * the panel fitter when we know it's used. */ + if (intel_using_power_well(dev)) { + I915_WRITE(PF_CTL(pipe), 0); + I915_WRITE(PF_WIN_SZ(pipe), 0); + } intel_ddi_disable_pipe_clock(intel_crtc);