1 files changed, 90 insertions, 45 deletions

diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index 4756ef639648..de8e9fb51595 100644
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -84,13 +84,15 @@ static void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi, enum port port)
 {
         struct drm_encoder *encoder = &intel_dsi->base.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);
         u32 mask;
 
         mask = LP_CTRL_FIFO_EMPTY | HS_CTRL_FIFO_EMPTY |
                 LP_DATA_FIFO_EMPTY | HS_DATA_FIFO_EMPTY;
 
-        if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(port)) & mask) == mask, 100))
+        if (intel_wait_for_register(dev_priv,
+                                    MIPI_GEN_FIFO_STAT(port), mask, mask,
+                                    100))
                 DRM_ERROR("DPI FIFOs are not empty\n");
 }
 
@@ -129,7 +131,7 @@ static ssize_t intel_dsi_host_transfer(struct mipi_dsi_host *host,
 {
         struct intel_dsi_host *intel_dsi_host = to_intel_dsi_host(host);
         struct drm_device *dev = intel_dsi_host->intel_dsi->base.base.dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         enum port port = intel_dsi_host->port;
         struct mipi_dsi_packet packet;
         ssize_t ret;
@@ -158,8 +160,10 @@ static ssize_t intel_dsi_host_transfer(struct mipi_dsi_host *host,
 
         /* note: this is never true for reads */
         if (packet.payload_length) {
-
-                if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(port)) & data_mask) == 0, 50))
+                if (intel_wait_for_register(dev_priv,
+                                            MIPI_GEN_FIFO_STAT(port),
+                                            data_mask, 0,
+                                            50))
                         DRM_ERROR("Timeout waiting for HS/LP DATA FIFO !full\n");
 
                 write_data(dev_priv, data_reg, packet.payload,
@@ -170,7 +174,10 @@ static ssize_t intel_dsi_host_transfer(struct mipi_dsi_host *host,
                 I915_WRITE(MIPI_INTR_STAT(port), GEN_READ_DATA_AVAIL);
         }
 
-        if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(port)) & ctrl_mask) == 0, 50)) {
+        if (intel_wait_for_register(dev_priv,
+                                    MIPI_GEN_FIFO_STAT(port),
+                                    ctrl_mask, 0,
+                                    50)) {
                 DRM_ERROR("Timeout waiting for HS/LP CTRL FIFO !full\n");
         }
 
@@ -179,7 +186,10 @@ static ssize_t intel_dsi_host_transfer(struct mipi_dsi_host *host,
         /* ->rx_len is set only for reads */
         if (msg->rx_len) {
                 data_mask = GEN_READ_DATA_AVAIL;
-                if (wait_for((I915_READ(MIPI_INTR_STAT(port)) & data_mask) == data_mask, 50))
+                if (intel_wait_for_register(dev_priv,
+                                            MIPI_INTR_STAT(port),
+                                            data_mask, data_mask,
+                                            50))
                         DRM_ERROR("Timeout waiting for read data.\n");
 
                 read_data(dev_priv, data_reg, msg->rx_buf, msg->rx_len);
@@ -250,7 +260,7 @@ static int dpi_send_cmd(struct intel_dsi *intel_dsi, u32 cmd, bool hs,
 {
         struct drm_encoder *encoder = &intel_dsi->base.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);
         u32 mask;
 
         /* XXX: pipe, hs */
@@ -269,7 +279,9 @@ static int dpi_send_cmd(struct intel_dsi *intel_dsi, u32 cmd, bool hs,
         I915_WRITE(MIPI_DPI_CONTROL(port), cmd);
 
         mask = SPL_PKT_SENT_INTERRUPT;
-        if (wait_for((I915_READ(MIPI_INTR_STAT(port)) & mask) == mask, 100))
+        if (intel_wait_for_register(dev_priv,
+                                    MIPI_INTR_STAT(port), mask, mask,
+                                    100))
                 DRM_ERROR("Video mode command 0x%08x send failed.\n", cmd);
 
         return 0;
@@ -302,7 +314,7 @@ static inline bool is_cmd_mode(struct intel_dsi *intel_dsi)
 static bool intel_dsi_compute_config(struct intel_encoder *encoder,
                                      struct intel_crtc_state *pipe_config)
 {
-        struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
         struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi,
                                                    base);
         struct intel_connector *intel_connector = intel_dsi->attached_connector;
@@ -313,8 +325,6 @@ static bool intel_dsi_compute_config(struct intel_encoder *encoder,
 
         DRM_DEBUG_KMS("\n");
 
-        pipe_config->has_dsi_encoder = true;
-
         if (fixed_mode) {
                 intel_fixed_panel_mode(fixed_mode, adjusted_mode);
 
@@ -348,7 +358,7 @@ static bool intel_dsi_compute_config(struct intel_encoder *encoder,
 
 static void bxt_dsi_device_ready(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_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
         enum port port;
         u32 val;
@@ -387,7 +397,7 @@ static void bxt_dsi_device_ready(struct intel_encoder *encoder)
 
 static void vlv_dsi_device_ready(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_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
         enum port port;
         u32 val;
@@ -437,7 +447,7 @@ static void intel_dsi_device_ready(struct intel_encoder *encoder)
 static void intel_dsi_port_enable(struct intel_encoder *encoder)
 {
         struct drm_device *dev = encoder->base.dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
         struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
         enum port port;
@@ -478,7 +488,7 @@ static void intel_dsi_port_enable(struct intel_encoder *encoder)
 static void intel_dsi_port_disable(struct intel_encoder *encoder)
 {
         struct drm_device *dev = encoder->base.dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
         enum port port;
 
@@ -497,7 +507,7 @@ static void intel_dsi_port_disable(struct intel_encoder *encoder)
 static void intel_dsi_enable(struct intel_encoder *encoder)
 {
         struct drm_device *dev = encoder->base.dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
         enum port port;
 
@@ -528,11 +538,10 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder);
 static void intel_dsi_pre_enable(struct intel_encoder *encoder)
 {
         struct drm_device *dev = encoder->base.dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
         struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
         enum port port;
-        u32 tmp;
 
         DRM_DEBUG_KMS("\n");
 
@@ -551,11 +560,13 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder)
 
         msleep(intel_dsi->panel_on_delay);
 
-        if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) {
+        if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
+                u32 val;
+
                 /* Disable DPOunit clock gating, can stall pipe */
-                tmp = I915_READ(DSPCLK_GATE_D);
-                tmp |= DPOUNIT_CLOCK_GATE_DISABLE;
-                I915_WRITE(DSPCLK_GATE_D, tmp);
+                val = I915_READ(DSPCLK_GATE_D);
+                val |= DPOUNIT_CLOCK_GATE_DISABLE;
+                I915_WRITE(DSPCLK_GATE_D, val);
         }
 
         /* put device in ready state */
@@ -601,7 +612,7 @@ static void intel_dsi_pre_disable(struct intel_encoder *encoder)
 static void intel_dsi_disable(struct intel_encoder *encoder)
 {
         struct drm_device *dev = encoder->base.dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
         enum port port;
         u32 temp;
@@ -640,7 +651,7 @@ static void intel_dsi_disable(struct intel_encoder *encoder)
 static void intel_dsi_clear_device_ready(struct intel_encoder *encoder)
 {
         struct drm_device *dev = encoder->base.dev;
-        struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
         struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
         enum port port;
 
@@ -666,8 +677,9 @@ static void intel_dsi_clear_device_ready(struct intel_encoder *encoder)
                 /* Wait till Clock lanes are in LP-00 state for MIPI Port A
                  * only. MIPI Port C has no similar bit for checking
                  */
-                if (wait_for(((I915_READ(port_ctrl) & AFE_LATCHOUT)
-                                                == 0x00000), 30))
+                if (intel_wait_for_register(dev_priv,
+                                            port_ctrl, AFE_LATCHOUT, 0,
+                                            30))
                         DRM_ERROR("DSI LP not going Low\n");
 
                 /* Disable MIPI PHY transparent latch */
@@ -684,7 +696,7 @@ static void intel_dsi_clear_device_ready(struct intel_encoder *encoder)
 
 static void intel_dsi_post_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_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
 
         DRM_DEBUG_KMS("\n");
@@ -693,7 +705,7 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder)
 
         intel_dsi_clear_device_ready(encoder);
 
-        if (!IS_BROXTON(dev_priv)) {
+        if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
                 u32 val;
 
                 val = I915_READ(DSPCLK_GATE_D);
@@ -719,7 +731,7 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder)
 static bool intel_dsi_get_hw_state(struct intel_encoder *encoder,
                                    enum pipe *pipe)
 {
-        struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
         struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
         struct drm_device *dev = encoder->base.dev;
         enum intel_display_power_domain power_domain;
@@ -793,7 +805,7 @@ static void bxt_dsi_get_pipe_config(struct intel_encoder *encoder,
                                  struct intel_crtc_state *pipe_config)
 {
         struct drm_device *dev = encoder->base.dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct drm_display_mode *adjusted_mode =
                                         &pipe_config->base.adjusted_mode;
         struct drm_display_mode *adjusted_mode_sw;
@@ -953,8 +965,6 @@ static void intel_dsi_get_config(struct intel_encoder *encoder,
         u32 pclk;
         DRM_DEBUG_KMS("\n");
 
-        pipe_config->has_dsi_encoder = true;
-
         if (IS_BROXTON(dev))
                 bxt_dsi_get_pipe_config(encoder, pipe_config);
 
@@ -1012,7 +1022,7 @@ static void set_dsi_timings(struct drm_encoder *encoder,
                             const struct drm_display_mode *adjusted_mode)
 {
         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 intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
         enum port port;
         unsigned int bpp = mipi_dsi_pixel_format_to_bpp(intel_dsi->pixel_format);
@@ -1098,7 +1108,7 @@ static void intel_dsi_prepare(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 intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
         struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
         const struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;
@@ -1171,6 +1181,12 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder)
         if (intel_dsi->clock_stop)
                 tmp |= CLOCKSTOP;
 
+        if (IS_BROXTON(dev_priv)) {
+                tmp |= BXT_DPHY_DEFEATURE_EN;
+                if (!is_cmd_mode(intel_dsi))
+                        tmp |= BXT_DEFEATURE_DPI_FIFO_CTR;
+        }
+
         for_each_dsi_port(port, intel_dsi->ports) {
                 I915_WRITE(MIPI_DSI_FUNC_PRG(port), val);
 
@@ -1378,12 +1394,13 @@ static const struct drm_encoder_funcs intel_dsi_funcs = {
 static const struct drm_connector_helper_funcs intel_dsi_connector_helper_funcs = {
         .get_modes = intel_dsi_get_modes,
         .mode_valid = intel_dsi_mode_valid,
-        .best_encoder = intel_best_encoder,
 };
 
 static const struct drm_connector_funcs intel_dsi_connector_funcs = {
         .dpms = drm_atomic_helper_connector_dpms,
         .detect = intel_dsi_detect,
+        .late_register = intel_connector_register,
+        .early_unregister = intel_connector_unregister,
         .destroy = intel_dsi_connector_destroy,
         .fill_modes = drm_helper_probe_single_connector_modes,
         .set_property = intel_dsi_set_property,
@@ -1413,7 +1430,7 @@ void intel_dsi_init(struct drm_device *dev)
         struct intel_connector *intel_connector;
         struct drm_connector *connector;
         struct drm_display_mode *scan, *fixed_mode = NULL;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         enum port port;
         unsigned int i;
 
@@ -1449,7 +1466,7 @@ void intel_dsi_init(struct drm_device *dev)
         connector = &intel_connector->base;
 
         drm_encoder_init(dev, encoder, &intel_dsi_funcs, DRM_MODE_ENCODER_DSI,
-                         NULL);
+                         "DSI %c", port_name(port));
 
         intel_encoder->compute_config = intel_dsi_compute_config;
         intel_encoder->pre_enable = intel_dsi_pre_enable;
@@ -1460,7 +1477,6 @@ void intel_dsi_init(struct drm_device *dev)
         intel_encoder->get_config = intel_dsi_get_config;
 
         intel_connector->get_hw_state = intel_connector_get_hw_state;
-        intel_connector->unregister = intel_connector_unregister;
 
         /*
          * On BYT/CHV, pipe A maps to MIPI DSI port A, pipe B maps to MIPI DSI
@@ -1473,10 +1489,42 @@ void intel_dsi_init(struct drm_device *dev)
         else
                 intel_encoder->crtc_mask = BIT(PIPE_B);
 
-        if (dev_priv->vbt.dsi.config->dual_link)
+        if (dev_priv->vbt.dsi.config->dual_link) {
                 intel_dsi->ports = BIT(PORT_A) | BIT(PORT_C);
-        else
+
+                switch (dev_priv->vbt.dsi.config->dl_dcs_backlight_ports) {
+                case DL_DCS_PORT_A:
+                        intel_dsi->dcs_backlight_ports = BIT(PORT_A);
+                        break;
+                case DL_DCS_PORT_C:
+                        intel_dsi->dcs_backlight_ports = BIT(PORT_C);
+                        break;
+                default:
+                case DL_DCS_PORT_A_AND_C:
+                        intel_dsi->dcs_backlight_ports = BIT(PORT_A) | BIT(PORT_C);
+                        break;
+                }
+
+                switch (dev_priv->vbt.dsi.config->dl_dcs_cabc_ports) {
+                case DL_DCS_PORT_A:
+                        intel_dsi->dcs_cabc_ports = BIT(PORT_A);
+                        break;
+                case DL_DCS_PORT_C:
+                        intel_dsi->dcs_cabc_ports = BIT(PORT_C);
+                        break;
+                default:
+                case DL_DCS_PORT_A_AND_C:
+                        intel_dsi->dcs_cabc_ports = BIT(PORT_A) | BIT(PORT_C);
+                        break;
+                }
+        } else {
                 intel_dsi->ports = BIT(port);
+                intel_dsi->dcs_backlight_ports = BIT(port);
+                intel_dsi->dcs_cabc_ports = BIT(port);
+        }
+
+        if (!dev_priv->vbt.dsi.config->cabc_supported)
+                intel_dsi->dcs_cabc_ports = 0;
 
         /* Create a DSI host (and a device) for each port. */
         for_each_dsi_port(port, intel_dsi->ports) {
@@ -1549,13 +1597,10 @@ void intel_dsi_init(struct drm_device *dev)
         connector->display_info.height_mm = fixed_mode->height_mm;
 
         intel_panel_init(&intel_connector->panel, fixed_mode, NULL);
+        intel_panel_setup_backlight(connector, INVALID_PIPE);
 
         intel_dsi_add_properties(intel_connector);
 
-        drm_connector_register(connector);
-
-        intel_panel_setup_backlight(connector, INVALID_PIPE);
-
         return;
 
 err: