[PATCH 06/14] drm/i915: Check the clock from adjusted mode in intel_crtc_active()

ville.syrjala
2013-09-04T15:26:29Z

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

The clock in crtc->mode doesn't necessarily mean anything. Let's look
at the clock in adjusted_mode instead.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_pm.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 48d93d3..397628b 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -45,10 +45,13 @@

static bool intel_crtc_active(struct drm_crtc *crtc)
{
+ struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+
/* Be paranoid as we can arrive here with only partial
* state retrieved from the hardware during setup.
*/
- return to_intel_crtc(crtc)->active && crtc->fb && crtc->mode.clock;
+ return intel_crtc->active && crtc->fb &&
+ intel_crtc->config.adjusted_mode.clock;
}

static void i8xx_disable_fbc(struct drm_device *dev)
--
1.8.1.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org