drm/i915/pps: move vlv_active_pipe() to intel_pps.c

All the users for vlv_active_pipe() are within intel_pps.c now, and
there are already uses of g4x_dp_port_enabled() and intel_dp->output_reg
in there, so seems fine to reduce interfaces and move vlv_active_pipe()
to intel_pps.c too.

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

diff --git a/drivers/gpu/drm/i915/display/g4x_dp.c b/drivers/gpu/drm/i915/display/g4x_dp.c
index 162802c54d4b24564ed5616cee506c9d0476deea..040478048b97531b618ec20dc87cdcd2c308c1b0 100644 (file)
--- a/drivers/gpu/drm/i915/display/g4x_dp.c
+++ b/drivers/gpu/drm/i915/display/g4x_dp.c
@@ -1245,20 +1245,6 @@ static void intel_dp_encoder_destroy(struct drm_encoder *encoder)
        kfree(enc_to_dig_port(to_intel_encoder(encoder)));
 }
 
-enum pipe vlv_active_pipe(struct intel_dp *intel_dp)
-{
-       struct intel_display *display = to_intel_display(intel_dp);
-       struct drm_i915_private *dev_priv = to_i915(display->drm);
-       struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
-       enum pipe pipe;
-
-       if (g4x_dp_port_enabled(dev_priv, intel_dp->output_reg,
-                               encoder->port, &pipe))
-               return pipe;
-
-       return INVALID_PIPE;
-}
-
 static void intel_dp_encoder_reset(struct drm_encoder *encoder)
 {
        struct intel_display *display = to_intel_display(encoder->dev);

diff --git a/drivers/gpu/drm/i915/display/g4x_dp.h b/drivers/gpu/drm/i915/display/g4x_dp.h
index a10638ab749c31b25cd76fdc0e6c3cd495342336..c75e64ae79b700be2c6360068238ebb9bb24ed42 100644 (file)
--- a/drivers/gpu/drm/i915/display/g4x_dp.h
+++ b/drivers/gpu/drm/i915/display/g4x_dp.h
@@ -19,7 +19,6 @@ struct intel_encoder;
 
 #ifdef I915
 const struct dpll *vlv_get_dpll(struct drm_i915_private *i915);
-enum pipe vlv_active_pipe(struct intel_dp *intel_dp);
 void g4x_dp_set_clock(struct intel_encoder *encoder,
                      struct intel_crtc_state *pipe_config);
 bool g4x_dp_port_enabled(struct drm_i915_private *dev_priv,
@@ -32,10 +31,6 @@ static inline const struct dpll *vlv_get_dpll(struct drm_i915_private *i915)
 {
        return NULL;
 }
-static inline int vlv_active_pipe(struct intel_dp *intel_dp)
-{
-       return 0;
-}
 static inline void g4x_dp_set_clock(struct intel_encoder *encoder,
                                    struct intel_crtc_state *pipe_config)
 {

diff --git a/drivers/gpu/drm/i915/display/intel_pps.c b/drivers/gpu/drm/i915/display/intel_pps.c
index 9cb091e7c94ab158cc7b334c7efad74d7672c131..819b2843946f0be7b53e0c1f6004e25b90918d5e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_pps.c
+++ b/drivers/gpu/drm/i915/display/intel_pps.c
@@ -1211,6 +1211,20 @@ static void vlv_steal_power_sequencer(struct intel_display *display,
        }
 }
 
+static enum pipe vlv_active_pipe(struct intel_dp *intel_dp)
+{
+       struct intel_display *display = to_intel_display(intel_dp);
+       struct drm_i915_private *dev_priv = to_i915(display->drm);
+       struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
+       enum pipe pipe;
+
+       if (g4x_dp_port_enabled(dev_priv, intel_dp->output_reg,
+                               encoder->port, &pipe))
+               return pipe;
+
+       return INVALID_PIPE;
+}
+
 /* Call on all DP, not just eDP */
 void vlv_pps_pipe_init(struct intel_dp *intel_dp)
 {