aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2014-07-04 12:38:35 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-07-10 16:16:44 -0400
commit34a6c70f099ef33e04e7436ee962293beead7b90 (patch)
treea90c201f54776eda317c55bbd9fc00a1d8e4d6f5
parent930e8c9e79acc0e3f1702dcd2345f4584818c2e9 (diff)
drm/i915: check the power domains in intel_lvds_get_hw_state()
Just like we do for the other encoders. This should fix some WARNs when running pm_rpm on SNB. Testcase: igt/pm_rpm Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=80463 Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_lvds.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 23126023aeba..cba04ddc8b01 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -71,8 +71,13 @@ static bool intel_lvds_get_hw_state(struct intel_encoder *encoder,
71 struct drm_device *dev = encoder->base.dev; 71 struct drm_device *dev = encoder->base.dev;
72 struct drm_i915_private *dev_priv = dev->dev_private; 72 struct drm_i915_private *dev_priv = dev->dev_private;
73 struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base); 73 struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base);
74 enum intel_display_power_domain power_domain;
74 u32 tmp; 75 u32 tmp;
75 76
77 power_domain = intel_display_port_power_domain(encoder);
78 if (!intel_display_power_enabled(dev_priv, power_domain))
79 return false;
80
76 tmp = I915_READ(lvds_encoder->reg); 81 tmp = I915_READ(lvds_encoder->reg);
77 82
78 if (!(tmp & LVDS_PORT_EN)) 83 if (!(tmp & LVDS_PORT_EN))