Commit 7794b6de authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/crtc: rename intel_get_crtc_for_pipe() to intel_crtc_for_pipe() 



The "get" in the name implies reference counting, remove it. This also
makes the function conform to naming style.

Suggested-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/6105d0ff44efac3c999af6382e4b0729e251f1e1.1638366969.git.jani.nikula@intel.com
parent 7b06894b

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

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ int intel_plane_atomic_check(struct intel_atomic_state *state, 
	const struct intel_plane_state *old_plane_state =

		intel_atomic_get_old_plane_state(state, plane);

	const struct intel_plane_state *new_master_plane_state;

	struct intel_crtc *crtc = intel_get_crtc_for_pipe(i915, plane->pipe);

	struct intel_crtc *crtc = intel_crtc_for_pipe(i915, plane->pipe);

	const struct intel_crtc_state *old_crtc_state =

		intel_atomic_get_old_crtc_state(state, crtc);

	struct intel_crtc_state *new_crtc_state =

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

+1 −1
Original line number Diff line number Diff line
@@ -2592,7 +2592,7 @@ int intel_modeset_calc_cdclk(struct intel_atomic_state *state) 
		struct intel_crtc_state *crtc_state;



		pipe = ilog2(new_cdclk_state->active_pipes);

		crtc = intel_get_crtc_for_pipe(dev_priv, pipe);

		crtc = intel_crtc_for_pipe(dev_priv, pipe);



		crtc_state = intel_atomic_get_crtc_state(&state->base, crtc);

		if (IS_ERR(crtc_state))

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

+8 −8
Original line number Diff line number Diff line
@@ -4830,7 +4830,7 @@ intel_encoder_current_mode(struct intel_encoder *encoder) 
	if (!encoder->get_hw_state(encoder, &pipe))

		return NULL;



	crtc = intel_get_crtc_for_pipe(dev_priv, pipe);

	crtc = intel_crtc_for_pipe(dev_priv, pipe);



	mode = kzalloc(sizeof(*mode), GFP_KERNEL);

	if (!mode)
@@ -8962,7 +8962,7 @@ static void intel_plane_possible_crtcs_init(struct drm_i915_private *dev_priv) 
	struct intel_plane *plane;



	for_each_intel_plane(&dev_priv->drm, plane) {

		struct intel_crtc *crtc = intel_get_crtc_for_pipe(dev_priv,

		struct intel_crtc *crtc = intel_crtc_for_pipe(dev_priv,

							      plane->pipe);



		plane->base.possible_crtcs = drm_crtc_mask(&crtc->base);
@@ -9956,7 +9956,7 @@ int intel_modeset_init(struct drm_i915_private *i915) 


void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)

{

	struct intel_crtc *crtc = intel_get_crtc_for_pipe(dev_priv, pipe);

	struct intel_crtc *crtc = intel_crtc_for_pipe(dev_priv, pipe);

	/* 640x480@60Hz, ~25175 kHz */

	struct dpll clock = {

		.m1 = 18,
@@ -10029,7 +10029,7 @@ void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe) 


void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)

{

	struct intel_crtc *crtc = intel_get_crtc_for_pipe(dev_priv, pipe);

	struct intel_crtc *crtc = intel_crtc_for_pipe(dev_priv, pipe);



	drm_dbg_kms(&dev_priv->drm, "disabling pipe %c due to force quirk\n",

		    pipe_name(pipe));
@@ -10081,7 +10081,7 @@ intel_sanitize_plane_mapping(struct drm_i915_private *dev_priv) 
			    "[PLANE:%d:%s] attached to the wrong pipe, disabling plane\n",

			    plane->base.base.id, plane->base.name);



		plane_crtc = intel_get_crtc_for_pipe(dev_priv, pipe);

		plane_crtc = intel_crtc_for_pipe(dev_priv, pipe);

		intel_plane_disable_noatomic(plane_crtc, plane);

	}

}
@@ -10334,7 +10334,7 @@ static void readout_plane_state(struct drm_i915_private *dev_priv) 


		visible = plane->get_hw_state(plane, &pipe);



		crtc = intel_get_crtc_for_pipe(dev_priv, pipe);

		crtc = intel_crtc_for_pipe(dev_priv, pipe);

		crtc_state = to_intel_crtc_state(crtc->base.state);



		intel_set_plane_visible(crtc_state, plane_state, visible);
@@ -10401,7 +10401,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) 
		pipe = 0;



		if (encoder->get_hw_state(encoder, &pipe)) {

			crtc = intel_get_crtc_for_pipe(dev_priv, pipe);

			crtc = intel_crtc_for_pipe(dev_priv, pipe);

			crtc_state = to_intel_crtc_state(crtc->base.state);



			encoder->base.crtc = &crtc->base;

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

+3 −3
Original line number Diff line number Diff line
@@ -1788,7 +1788,7 @@ intel_get_first_crtc(struct drm_i915_private *dev_priv) 
}



static inline struct intel_crtc *

intel_get_crtc_for_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)

intel_crtc_for_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)

{

	/* pipe_to_crtc_mapping may have hole on any of 3 display pipe system */

	drm_WARN_ON(&dev_priv->drm,
@@ -2028,7 +2028,7 @@ intel_crtc_wait_for_next_vblank(struct intel_crtc *crtc) 
static inline void

intel_wait_for_vblank(struct drm_i915_private *dev_priv, enum pipe pipe)

{

	struct intel_crtc *crtc = intel_get_crtc_for_pipe(dev_priv, pipe);

	struct intel_crtc *crtc = intel_crtc_for_pipe(dev_priv, pipe);



	intel_crtc_wait_for_next_vblank(crtc);

}
@@ -2036,7 +2036,7 @@ intel_wait_for_vblank(struct drm_i915_private *dev_priv, enum pipe pipe) 
static inline void

intel_wait_for_vblank_if_active(struct drm_i915_private *dev_priv, enum pipe pipe)

{

	struct intel_crtc *crtc = intel_get_crtc_for_pipe(dev_priv, pipe);

	struct intel_crtc *crtc = intel_crtc_for_pipe(dev_priv, pipe);



	if (crtc->active)

		intel_crtc_wait_for_next_vblank(crtc);

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

+1 −1
Original line number Diff line number Diff line
@@ -1823,7 +1823,7 @@ void chv_enable_pll(const struct intel_crtc_state *crtc_state) 
int vlv_force_pll_on(struct drm_i915_private *dev_priv, enum pipe pipe,

		     const struct dpll *dpll)

{

	struct intel_crtc *crtc = intel_get_crtc_for_pipe(dev_priv, pipe);

	struct intel_crtc *crtc = intel_crtc_for_pipe(dev_priv, pipe);

	struct intel_crtc_state *crtc_state;



	crtc_state = intel_crtc_state_alloc(crtc);