drm/i915/pps: add vlv_pps_backlight_initial_pipe()

Add vlv_pps_backlight_initial_pipe() and move the VLV/CHV initial
backlight pipe logic there, hiding the PPS pipe details inside PPS code.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/b0587f183d8bb06679a75b04f956762435d10181.1726681620.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 12706f24a36dc78007cf6ca7c3284981b4a8338c..9859a7d3ce8001db3ac631653529657fd8415e95 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -6629,20 +6629,8 @@ static void intel_edp_backlight_setup(struct intel_dp *intel_dp,
        struct drm_i915_private *i915 = dp_to_i915(intel_dp);
        enum pipe pipe = INVALID_PIPE;
 
-       if (IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915)) {
-               /*
-                * Figure out the current pipe for the initial backlight setup.
-                * If the current pipe isn't valid, try the PPS pipe, and if that
-                * fails just assume pipe A.
-                */
-               pipe = vlv_active_pipe(intel_dp);
-
-               if (pipe != PIPE_A && pipe != PIPE_B)
-                       pipe = intel_dp->pps.vlv_pps_pipe;
-
-               if (pipe != PIPE_A && pipe != PIPE_B)
-                       pipe = PIPE_A;
-       }
+       if (IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915))
+               pipe = vlv_pps_backlight_initial_pipe(intel_dp);
 
        intel_backlight_setup(connector, pipe);
 }

diff --git a/drivers/gpu/drm/i915/display/intel_pps.c b/drivers/gpu/drm/i915/display/intel_pps.c
index 63bae4c3a71a9bf0efeefbb468856d2af45f606e..9cb091e7c94ab158cc7b334c7efad74d7672c131 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_pps.c
+++ b/drivers/gpu/drm/i915/display/intel_pps.c
@@ -1227,6 +1227,26 @@ void vlv_pps_pipe_reset(struct intel_dp *intel_dp)
                intel_dp->pps.vlv_active_pipe = vlv_active_pipe(intel_dp);
 }
 
+enum pipe vlv_pps_backlight_initial_pipe(struct intel_dp *intel_dp)
+{
+       enum pipe pipe;
+
+       /*
+        * Figure out the current pipe for the initial backlight setup. If the
+        * current pipe isn't valid, try the PPS pipe, and if that fails just
+        * assume pipe A.
+        */
+       pipe = vlv_active_pipe(intel_dp);
+
+       if (pipe != PIPE_A && pipe != PIPE_B)
+               pipe = intel_dp->pps.vlv_pps_pipe;
+
+       if (pipe != PIPE_A && pipe != PIPE_B)
+               pipe = PIPE_A;
+
+       return pipe;
+}
+
 /* Call on all DP, not just eDP */
 void vlv_pps_port_enable_unlocked(struct intel_encoder *encoder,
                                  const struct intel_crtc_state *crtc_state)

diff --git a/drivers/gpu/drm/i915/display/intel_pps.h b/drivers/gpu/drm/i915/display/intel_pps.h
index 5b3eb7fb7e1f71ff84dadd620c67764286590360..a5339a65485d9ea0b212531f185231b7902515a3 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_pps.h
+++ b/drivers/gpu/drm/i915/display/intel_pps.h
@@ -47,6 +47,7 @@ void intel_pps_reset_all(struct intel_display *display);
 
 void vlv_pps_pipe_init(struct intel_dp *intel_dp);
 void vlv_pps_pipe_reset(struct intel_dp *intel_dp);
+enum pipe vlv_pps_backlight_initial_pipe(struct intel_dp *intel_dp);
 void vlv_pps_port_enable_unlocked(struct intel_encoder *encoder,
                                  const struct intel_crtc_state *crtc_state);
 void vlv_pps_port_disable(struct intel_encoder *encoder,