1 files changed, 19 insertions, 10 deletions

diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index 378f879f4015..01b8e9f4c272 100644
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -634,7 +634,6 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder)
 {
         struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
         struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
-        u32 val;
 
         DRM_DEBUG_KMS("\n");
 
@@ -642,9 +641,13 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder)
 
         intel_dsi_clear_device_ready(encoder);
 
-        val = I915_READ(DSPCLK_GATE_D);
-        val &= ~DPOUNIT_CLOCK_GATE_DISABLE;
-        I915_WRITE(DSPCLK_GATE_D, val);
+        if (!IS_BROXTON(dev_priv)) {
+                u32 val;
+
+                val = I915_READ(DSPCLK_GATE_D);
+                val &= ~DPOUNIT_CLOCK_GATE_DISABLE;
+                I915_WRITE(DSPCLK_GATE_D, val);
+        }
 
         drm_panel_unprepare(intel_dsi->panel);
 
@@ -664,13 +667,16 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder,
         struct drm_device *dev = encoder->base.dev;
         enum intel_display_power_domain power_domain;
         enum port port;
+        bool ret;
 
         DRM_DEBUG_KMS("\n");
 
         power_domain = intel_display_port_power_domain(encoder);
-        if (!intel_display_power_is_enabled(dev_priv, power_domain))
+        if (!intel_display_power_get_if_enabled(dev_priv, power_domain))
                 return false;
 
+        ret = false;
+
         /* XXX: this only works for one DSI output */
         for_each_dsi_port(port, intel_dsi->ports) {
                 i915_reg_t ctrl_reg = IS_BROXTON(dev) ?
@@ -691,12 +697,16 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder,
                 if (dpi_enabled || (func & CMD_MODE_DATA_WIDTH_MASK)) {
                         if (I915_READ(MIPI_DEVICE_READY(port)) & DEVICE_READY) {
                                 *pipe = port == PORT_A ? PIPE_A : PIPE_B;
-                                return true;
+                                ret = true;
+
+                                goto out;
                         }
                 }
         }
+out:
+        intel_display_power_put(dev_priv, power_domain);
 
-        return false;
+        return ret;
 }
 
 static void intel_dsi_get_config(struct intel_encoder *encoder,
@@ -775,10 +785,9 @@ static void set_dsi_timings(struct drm_encoder *encoder,
 {
         struct drm_device *dev = encoder->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
         struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
         enum port port;
-        unsigned int bpp = intel_crtc->config->pipe_bpp;
+        unsigned int bpp = dsi_pixel_format_bpp(intel_dsi->pixel_format);
         unsigned int lane_count = intel_dsi->lane_count;
 
         u16 hactive, hfp, hsync, hbp, vfp, vsync, vbp;
@@ -849,7 +858,7 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder)
         struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
         const struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;
         enum port port;
-        unsigned int bpp = intel_crtc->config->pipe_bpp;
+        unsigned int bpp = dsi_pixel_format_bpp(intel_dsi->pixel_format);
         u32 val, tmp;
         u16 mode_hdisplay;