diff options
| author | Imre Deak | 2014-04-14 19:24:33 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-05-05 09:09:03 +0200 |
| commit | bb4932c4f17b68f34645ffbcf845e4c29d17290b (patch) | |
| tree | 67642469f1517c3f51d08d182ded904904cb4316 /drivers/gpu/drm/i915/intel_dp.c | |
| parent | drm/i915: add missing error capturing of the PIPESTAT reg (diff) | |
| download | kernel-qcow2-linux-bb4932c4f17b68f34645ffbcf845e4c29d17290b.tar.gz kernel-qcow2-linux-bb4932c4f17b68f34645ffbcf845e4c29d17290b.tar.xz kernel-qcow2-linux-bb4932c4f17b68f34645ffbcf845e4c29d17290b.zip | |
drm/i915: vlv: check port power domain instead of only D0 for eDP VDD on
Some platforms need additional power domains to be on in addition to the
device D0 state to access the panel registers.
Suggested by Daniel.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76987
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index a421c81f2d88..34ed143ab479 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -313,8 +313,12 @@ static bool edp_have_panel_vdd(struct intel_dp *intel_dp) { struct drm_device *dev = intel_dp_to_dev(intel_dp); struct drm_i915_private *dev_priv = dev->dev_private; + struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); + struct intel_encoder *intel_encoder = &intel_dig_port->base; + enum intel_display_power_domain power_domain; - return !dev_priv->pm.suspended && + power_domain = intel_display_port_power_domain(intel_encoder); + return intel_display_power_enabled(dev_priv, power_domain) && (I915_READ(_pp_ctrl_reg(intel_dp)) & EDP_FORCE_VDD) != 0; } |