[PATCH 21/47] drm/i915: add DP support to intel_ddi_get_hw_state

Paulo Zanoni
2012-10-02T20:53:32Z

drivers/gpu/drm/i915/intel_ddi.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 60e089c..57dd975 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -1012,11 +1012,11 @@ bool intel_ddi_get_hw_state(struct intel_encoder *encoder,
{
struct drm_device *dev = encoder->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
- struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);
+ enum port port = intel_ddi_get_encoder_port(encoder);
u32 tmp;
int i;

- tmp = I915_READ(DDI_BUF_CTL(intel_hdmi->ddi_port));
+ tmp = I915_READ(DDI_BUF_CTL(port));

if (!(tmp & DDI_BUF_CTL_ENABLE))
return false;
@@ -1025,13 +1025,13 @@ bool intel_ddi_get_hw_state(struct intel_encoder *encoder,
tmp = I915_READ(DDI_FUNC_CTL(i));

if ((tmp & PIPE_DDI_PORT_MASK)
- == PIPE_DDI_SELECT_PORT(intel_hdmi->ddi_port)) {
+ == PIPE_DDI_SELECT_PORT(port)) {
*pipe = i;
return true;
}
}

- DRM_DEBUG_KMS("No pipe for ddi port %i found\n", intel_hdmi->ddi_port);
+ DRM_DEBUG_KMS("No pipe for ddi port %i found\n", port);

return true;
}
--
1.7.10.4