Commit 46f6a34a authored by Jani Nikula's avatar Jani Nikula
Browse files

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e12ae0a931f113f3bbbf1b4c66108b572a933efb.1726681620.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 3ac6d358

drivers/gpu/drm/i915/display/g4x_dp.c

+0 −14
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/display/g4x_dp.h

+0 −5
Original line number Diff line number Diff line
@@ -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)

{

drivers/gpu/drm/i915/display/intel_pps.c

+14 −0
Original line number Diff line number Diff line
@@ -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)

{