]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/i915/psr: Move PSR aux setup to it's own function.
authorDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Tue, 13 Mar 2018 03:46:45 +0000 (20:46 -0700)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Wed, 21 Mar 2018 20:23:11 +0000 (13:23 -0700)
Non-functional change useful for the following patch.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180313034646.3721-1-dhinakaran.pandiyan@intel.com
drivers/gpu/drm/i915/intel_psr.c

index 317cb4a1269324ebb66779e329d011c3f61656b2..2c001f4fba3ea11bd0c837db4a4c8389704af631 100644 (file)
@@ -246,7 +246,7 @@ static i915_reg_t psr_aux_data_reg(struct drm_i915_private *dev_priv,
                return EDP_PSR_AUX_DATA(index);
 }
 
-static void hsw_psr_enable_sink(struct intel_dp *intel_dp)
+static void hsw_psr_setup_aux(struct intel_dp *intel_dp)
 {
        struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
        struct drm_device *dev = dig_port->base.base.dev;
@@ -267,6 +267,24 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)
        BUILD_BUG_ON(sizeof(aux_msg) > 20);
 
        aux_clock_divider = intel_dp->get_aux_clock_divider(intel_dp, 0);
+       aux_ctl_reg = psr_aux_ctl_reg(dev_priv, port);
+
+       /* Setup AUX registers */
+       for (i = 0; i < sizeof(aux_msg); i += 4)
+               I915_WRITE(psr_aux_data_reg(dev_priv, port, i >> 2),
+                          intel_dp_pack_aux(&aux_msg[i], sizeof(aux_msg) - i));
+
+       aux_ctl = intel_dp->get_aux_send_ctl(intel_dp, 0, sizeof(aux_msg),
+                                            aux_clock_divider);
+       I915_WRITE(aux_ctl_reg, aux_ctl);
+}
+
+static void hsw_psr_enable_sink(struct intel_dp *intel_dp)
+{
+       struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
+       struct drm_device *dev = dig_port->base.base.dev;
+       struct drm_i915_private *dev_priv = to_i915(dev);
+
 
        /* Enable AUX frame sync at sink */
        if (dev_priv->psr.aux_frame_sync)
@@ -285,16 +303,7 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)
                drm_dp_dpcd_writeb(&intel_dp->aux, DP_PSR_EN_CFG,
                                   DP_PSR_ENABLE);
 
-       aux_ctl_reg = psr_aux_ctl_reg(dev_priv, port);
-
-       /* Setup AUX registers */
-       for (i = 0; i < sizeof(aux_msg); i += 4)
-               I915_WRITE(psr_aux_data_reg(dev_priv, port, i >> 2),
-                          intel_dp_pack_aux(&aux_msg[i], sizeof(aux_msg) - i));
-
-       aux_ctl = intel_dp->get_aux_send_ctl(intel_dp, 0, sizeof(aux_msg),
-                                            aux_clock_divider);
-       I915_WRITE(aux_ctl_reg, aux_ctl);
+       hsw_psr_setup_aux(intel_dp);
 }
 
 static void vlv_psr_enable_source(struct intel_dp *intel_dp,