1 files changed, 21 insertions, 21 deletions

diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index b9329c2a670a..6700a7be7f78 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -154,7 +154,7 @@ static bool audio_rate_need_prog(struct intel_crtc *crtc,
 {
         if (((mode->clock == TMDS_297M) ||
                  (mode->clock == TMDS_296M)) &&
-                intel_pipe_has_type(crtc, INTEL_OUTPUT_HDMI))
+                intel_crtc_has_type(crtc->config, INTEL_OUTPUT_HDMI))
                 return true;
         else
                 return false;
@@ -165,7 +165,7 @@ static bool intel_eld_uptodate(struct drm_connector *connector,
                                i915_reg_t reg_elda, uint32_t bits_elda,
                                i915_reg_t reg_edid)
 {
-        struct drm_i915_private *dev_priv = connector->dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(connector->dev);
         uint8_t *eld = connector->eld;
         uint32_t tmp;
         int i;
@@ -189,7 +189,7 @@ static bool intel_eld_uptodate(struct drm_connector *connector,
 
 static void g4x_audio_codec_disable(struct intel_encoder *encoder)
 {
-        struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
         uint32_t eldv, tmp;
 
         DRM_DEBUG_KMS("Disable audio codec\n");
@@ -210,7 +210,7 @@ static void g4x_audio_codec_enable(struct drm_connector *connector,
                                    struct intel_encoder *encoder,
                                    const struct drm_display_mode *adjusted_mode)
 {
-        struct drm_i915_private *dev_priv = connector->dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(connector->dev);
         uint8_t *eld = connector->eld;
         uint32_t eldv;
         uint32_t tmp;
@@ -247,7 +247,7 @@ static void g4x_audio_codec_enable(struct drm_connector *connector,
 
 static void hsw_audio_codec_disable(struct intel_encoder *encoder)
 {
-        struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
         struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
         enum pipe pipe = intel_crtc->pipe;
         uint32_t tmp;
@@ -262,7 +262,7 @@ static void hsw_audio_codec_disable(struct intel_encoder *encoder)
         tmp |= AUD_CONFIG_N_PROG_ENABLE;
         tmp &= ~AUD_CONFIG_UPPER_N_MASK;
         tmp &= ~AUD_CONFIG_LOWER_N_MASK;
-        if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT))
+        if (intel_crtc_has_dp_encoder(intel_crtc->config))
                 tmp |= AUD_CONFIG_N_VALUE_INDEX;
         I915_WRITE(HSW_AUD_CFG(pipe), tmp);
 
@@ -279,7 +279,7 @@ static void hsw_audio_codec_enable(struct drm_connector *connector,
                                    struct intel_encoder *encoder,
                                    const struct drm_display_mode *adjusted_mode)
 {
-        struct drm_i915_private *dev_priv = connector->dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(connector->dev);
         struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
         enum pipe pipe = intel_crtc->pipe;
         struct i915_audio_component *acomp = dev_priv->audio_component;
@@ -328,7 +328,7 @@ static void hsw_audio_codec_enable(struct drm_connector *connector,
         tmp = I915_READ(HSW_AUD_CFG(pipe));
         tmp &= ~AUD_CONFIG_N_VALUE_INDEX;
         tmp &= ~AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK;
-        if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT))
+        if (intel_crtc_has_dp_encoder(intel_crtc->config))
                 tmp |= AUD_CONFIG_N_VALUE_INDEX;
         else
                 tmp |= audio_config_hdmi_pixel_clock(adjusted_mode);
@@ -357,7 +357,7 @@ static void hsw_audio_codec_enable(struct drm_connector *connector,
 
 static void ilk_audio_codec_disable(struct intel_encoder *encoder)
 {
-        struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
         struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
         struct intel_digital_port *intel_dig_port =
                 enc_to_dig_port(&encoder->base);
@@ -389,7 +389,7 @@ static void ilk_audio_codec_disable(struct intel_encoder *encoder)
         tmp |= AUD_CONFIG_N_PROG_ENABLE;
         tmp &= ~AUD_CONFIG_UPPER_N_MASK;
         tmp &= ~AUD_CONFIG_LOWER_N_MASK;
-        if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT))
+        if (intel_crtc_has_dp_encoder(intel_crtc->config))
                 tmp |= AUD_CONFIG_N_VALUE_INDEX;
         I915_WRITE(aud_config, tmp);
 
@@ -405,7 +405,7 @@ static void ilk_audio_codec_enable(struct drm_connector *connector,
                                    struct intel_encoder *encoder,
                                    const struct drm_display_mode *adjusted_mode)
 {
-        struct drm_i915_private *dev_priv = connector->dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(connector->dev);
         struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
         struct intel_digital_port *intel_dig_port =
                 enc_to_dig_port(&encoder->base);
@@ -475,7 +475,7 @@ static void ilk_audio_codec_enable(struct drm_connector *connector,
         tmp &= ~AUD_CONFIG_N_VALUE_INDEX;
         tmp &= ~AUD_CONFIG_N_PROG_ENABLE;
         tmp &= ~AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK;
-        if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT))
+        if (intel_crtc_has_dp_encoder(intel_crtc->config))
                 tmp |= AUD_CONFIG_N_VALUE_INDEX;
         else
                 tmp |= audio_config_hdmi_pixel_clock(adjusted_mode);
@@ -496,7 +496,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)
         const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
         struct drm_connector *connector;
         struct drm_device *dev = encoder->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct i915_audio_component *acomp = dev_priv->audio_component;
         struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
         enum port port = intel_dig_port->port;
@@ -513,7 +513,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)
 
         /* ELD Conn_Type */
         connector->eld[5] &= ~(3 << 2);
-        if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT))
+        if (intel_crtc_has_dp_encoder(crtc->config))
                 connector->eld[5] |= (1 << 2);
 
         connector->eld[6] = drm_av_sync_delay(connector, adjusted_mode) / 2;
@@ -543,7 +543,7 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder)
 {
         struct drm_encoder *encoder = &intel_encoder->base;
         struct drm_device *dev = encoder->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct i915_audio_component *acomp = dev_priv->audio_component;
         struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
         enum port port = intel_dig_port->port;
@@ -749,14 +749,14 @@ static int i915_audio_component_bind(struct device *i915_dev,
         if (WARN_ON(acomp->ops || acomp->dev))
                 return -EEXIST;
 
-        drm_modeset_lock_all(dev_priv->dev);
+        drm_modeset_lock_all(&dev_priv->drm);
         acomp->ops = &i915_audio_component_ops;
         acomp->dev = i915_dev;
         BUILD_BUG_ON(MAX_PORTS != I915_MAX_PORTS);
         for (i = 0; i < ARRAY_SIZE(acomp->aud_sample_rate); i++)
                 acomp->aud_sample_rate[i] = 0;
         dev_priv->audio_component = acomp;
-        drm_modeset_unlock_all(dev_priv->dev);
+        drm_modeset_unlock_all(&dev_priv->drm);
 
         return 0;
 }
@@ -767,11 +767,11 @@ static void i915_audio_component_unbind(struct device *i915_dev,
         struct i915_audio_component *acomp = data;
         struct drm_i915_private *dev_priv = dev_to_i915(i915_dev);
 
-        drm_modeset_lock_all(dev_priv->dev);
+        drm_modeset_lock_all(&dev_priv->drm);
         acomp->ops = NULL;
         acomp->dev = NULL;
         dev_priv->audio_component = NULL;
-        drm_modeset_unlock_all(dev_priv->dev);
+        drm_modeset_unlock_all(&dev_priv->drm);
 }
 
 static const struct component_ops i915_audio_component_bind_ops = {
@@ -799,7 +799,7 @@ void i915_audio_component_init(struct drm_i915_private *dev_priv)
 {
         int ret;
 
-        ret = component_add(dev_priv->dev->dev, &i915_audio_component_bind_ops);
+        ret = component_add(dev_priv->drm.dev, &i915_audio_component_bind_ops);
         if (ret < 0) {
                 DRM_ERROR("failed to add audio component (%d)\n", ret);
                 /* continue with reduced functionality */
@@ -821,6 +821,6 @@ void i915_audio_component_cleanup(struct drm_i915_private *dev_priv)
         if (!dev_priv->audio_component_registered)
                 return;
 
-        component_del(dev_priv->dev->dev, &i915_audio_component_bind_ops);
+        component_del(dev_priv->drm.dev, &i915_audio_component_bind_ops);
         dev_priv->audio_component_registered = false;
 }