Commit 5f88a9c6 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Constify states passed to enable/disable/etc. encoder hooks 



The enable/disable/etc. encoder hooks aren't supposed to alter the
state(s), so pass them as const. Unfortunately C lacks any kind of deep
const thingy, so this can't catch all abuses. But at least it acts as a
hint to the reader telling them not to mess about with the state(s).

v2: Update intel_tv_mode_find() and ironlake_edp_pll_on() as well
v3: Deal with intel_sdvo_connector_state

Acked-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170818134958.15502-9-ville.syrjala@linux.intel.com
parent d2419ffc

drivers/gpu/drm/i915/intel_crt.c

+11 −11
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static void hsw_crt_get_config(struct intel_encoder *encoder, 
/* Note: The caller is required to filter out dpms modes not supported by the

 * platform. */

static void intel_crt_set_dpms(struct intel_encoder *encoder,

			       struct intel_crtc_state *crtc_state,

			       const struct intel_crtc_state *crtc_state,

			       int mode)

{

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
@@ -194,28 +194,28 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder, 
}



static void intel_disable_crt(struct intel_encoder *encoder,

			      struct intel_crtc_state *old_crtc_state,

			      struct drm_connector_state *old_conn_state)

			      const struct intel_crtc_state *old_crtc_state,

			      const struct drm_connector_state *old_conn_state)

{

	intel_crt_set_dpms(encoder, old_crtc_state, DRM_MODE_DPMS_OFF);

}



static void pch_disable_crt(struct intel_encoder *encoder,

			    struct intel_crtc_state *old_crtc_state,

			    struct drm_connector_state *old_conn_state)

			    const struct intel_crtc_state *old_crtc_state,

			    const struct drm_connector_state *old_conn_state)

{

}



static void pch_post_disable_crt(struct intel_encoder *encoder,

				 struct intel_crtc_state *old_crtc_state,

				 struct drm_connector_state *old_conn_state)

				 const struct intel_crtc_state *old_crtc_state,

				 const struct drm_connector_state *old_conn_state)

{

	intel_disable_crt(encoder, old_crtc_state, old_conn_state);

}



static void hsw_post_disable_crt(struct intel_encoder *encoder,

				 struct intel_crtc_state *old_crtc_state,

				 struct drm_connector_state *old_conn_state)

				 const struct intel_crtc_state *old_crtc_state,

				 const struct drm_connector_state *old_conn_state)

{

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
@@ -228,8 +228,8 @@ static void hsw_post_disable_crt(struct intel_encoder *encoder, 
}



static void intel_enable_crt(struct intel_encoder *encoder,

			     struct intel_crtc_state *pipe_config,

			     struct drm_connector_state *conn_state)

			     const struct intel_crtc_state *pipe_config,

			     const struct drm_connector_state *conn_state)

{

	intel_crt_set_dpms(encoder, pipe_config, DRM_MODE_DPMS_ON);

}

drivers/gpu/drm/i915/intel_ddi.c

+15 −15
Original line number Diff line number Diff line
@@ -785,7 +785,7 @@ static void intel_wait_ddi_buf_idle(struct drm_i915_private *dev_priv, 
	DRM_ERROR("Timeout waiting for DDI BUF %c idle bit\n", port_name(port));

}



static uint32_t hsw_pll_to_ddi_pll_sel(struct intel_shared_dpll *pll)

static uint32_t hsw_pll_to_ddi_pll_sel(const struct intel_shared_dpll *pll)

{

	switch (pll->id) {

	case DPLL_ID_WRPLL1:
@@ -2080,7 +2080,7 @@ uint32_t ddi_signal_levels(struct intel_dp *intel_dp) 
}



static void intel_ddi_clk_select(struct intel_encoder *encoder,

				 struct intel_shared_dpll *pll)

				 const struct intel_shared_dpll *pll)

{

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

	enum port port = intel_ddi_get_encoder_port(encoder);
@@ -2153,7 +2153,7 @@ static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder, 
				      bool has_infoframe,

				      const struct intel_crtc_state *crtc_state,

				      const struct drm_connector_state *conn_state,

				      struct intel_shared_dpll *pll)

				      const struct intel_shared_dpll *pll)

{

	struct intel_digital_port *intel_dig_port = enc_to_dig_port(&encoder->base);

	struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;
@@ -2182,8 +2182,8 @@ static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder, 
}



static void intel_ddi_pre_enable(struct intel_encoder *encoder,

				 struct intel_crtc_state *pipe_config,

				 struct drm_connector_state *conn_state)

				 const struct intel_crtc_state *pipe_config,

				 const struct drm_connector_state *conn_state)

{

	int type = encoder->type;
@@ -2204,8 +2204,8 @@ static void intel_ddi_pre_enable(struct intel_encoder *encoder, 
}



static void intel_ddi_post_disable(struct intel_encoder *intel_encoder,

				   struct intel_crtc_state *old_crtc_state,

				   struct drm_connector_state *old_conn_state)

				   const struct intel_crtc_state *old_crtc_state,

				   const struct drm_connector_state *old_conn_state)

{

	struct drm_encoder *encoder = &intel_encoder->base;

	struct drm_i915_private *dev_priv = to_i915(encoder->dev);
@@ -2270,8 +2270,8 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder, 
}



void intel_ddi_fdi_post_disable(struct intel_encoder *encoder,

				struct intel_crtc_state *old_crtc_state,

				struct drm_connector_state *old_conn_state)

				const struct intel_crtc_state *old_crtc_state,

				const struct drm_connector_state *old_conn_state)

{

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

	uint32_t val;
@@ -2303,8 +2303,8 @@ void intel_ddi_fdi_post_disable(struct intel_encoder *encoder, 
}



static void intel_enable_ddi(struct intel_encoder *intel_encoder,

			     struct intel_crtc_state *pipe_config,

			     struct drm_connector_state *conn_state)

			     const struct intel_crtc_state *pipe_config,

			     const struct drm_connector_state *conn_state)

{

	struct drm_encoder *encoder = &intel_encoder->base;

	struct drm_i915_private *dev_priv = to_i915(encoder->dev);
@@ -2344,8 +2344,8 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder, 
}



static void intel_disable_ddi(struct intel_encoder *intel_encoder,

			      struct intel_crtc_state *old_crtc_state,

			      struct drm_connector_state *old_conn_state)

			      const struct intel_crtc_state *old_crtc_state,

			      const struct drm_connector_state *old_conn_state)

{

	struct drm_encoder *encoder = &intel_encoder->base;

	int type = intel_encoder->type;
@@ -2369,8 +2369,8 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder, 
}



static void bxt_ddi_pre_pll_enable(struct intel_encoder *encoder,

				   struct intel_crtc_state *pipe_config,

				   struct drm_connector_state *conn_state)

				   const struct intel_crtc_state *pipe_config,

				   const struct drm_connector_state *conn_state)

{

	uint8_t mask = pipe_config->lane_lat_optim_mask;

drivers/gpu/drm/i915/intel_dp.c

+32 −32
Original line number Diff line number Diff line
@@ -1861,7 +1861,7 @@ void intel_dp_set_link_params(struct intel_dp *intel_dp, 
}



static void intel_dp_prepare(struct intel_encoder *encoder,

			     struct intel_crtc_state *pipe_config)

			     const struct intel_crtc_state *pipe_config)

{

	struct drm_device *dev = encoder->base.dev;

	struct drm_i915_private *dev_priv = to_i915(dev);
@@ -2461,7 +2461,7 @@ static void assert_edp_pll(struct drm_i915_private *dev_priv, bool state) 
#define assert_edp_pll_disabled(d) assert_edp_pll((d), false)



static void ironlake_edp_pll_on(struct intel_dp *intel_dp,

				struct intel_crtc_state *pipe_config)

				const struct intel_crtc_state *pipe_config)

{

	struct intel_crtc *crtc = to_intel_crtc(pipe_config->base.crtc);

	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
@@ -2688,8 +2688,8 @@ static void intel_dp_get_config(struct intel_encoder *encoder, 
}



static void intel_disable_dp(struct intel_encoder *encoder,

			     struct intel_crtc_state *old_crtc_state,

			     struct drm_connector_state *old_conn_state)

			     const struct intel_crtc_state *old_crtc_state,

			     const struct drm_connector_state *old_conn_state)

{

	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
@@ -2713,8 +2713,8 @@ static void intel_disable_dp(struct intel_encoder *encoder, 
}



static void ilk_post_disable_dp(struct intel_encoder *encoder,

				struct intel_crtc_state *old_crtc_state,

				struct drm_connector_state *old_conn_state)

				const struct intel_crtc_state *old_crtc_state,

				const struct drm_connector_state *old_conn_state)

{

	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);

	enum port port = dp_to_dig_port(intel_dp)->port;
@@ -2727,8 +2727,8 @@ static void ilk_post_disable_dp(struct intel_encoder *encoder, 
}



static void vlv_post_disable_dp(struct intel_encoder *encoder,

				struct intel_crtc_state *old_crtc_state,

				struct drm_connector_state *old_conn_state)

				const struct intel_crtc_state *old_crtc_state,

				const struct drm_connector_state *old_conn_state)

{

	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
@@ -2736,8 +2736,8 @@ static void vlv_post_disable_dp(struct intel_encoder *encoder, 
}



static void chv_post_disable_dp(struct intel_encoder *encoder,

				struct intel_crtc_state *old_crtc_state,

				struct drm_connector_state *old_conn_state)

				const struct intel_crtc_state *old_crtc_state,

				const struct drm_connector_state *old_conn_state)

{

	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);

	struct drm_device *dev = encoder->base.dev;
@@ -2842,7 +2842,7 @@ _intel_dp_set_link_train(struct intel_dp *intel_dp, 
}



static void intel_dp_enable_port(struct intel_dp *intel_dp,

				 struct intel_crtc_state *old_crtc_state)

				 const struct intel_crtc_state *old_crtc_state)

{

	struct drm_device *dev = intel_dp_to_dev(intel_dp);

	struct drm_i915_private *dev_priv = to_i915(dev);
@@ -2866,8 +2866,8 @@ static void intel_dp_enable_port(struct intel_dp *intel_dp, 
}



static void intel_enable_dp(struct intel_encoder *encoder,

			    struct intel_crtc_state *pipe_config,

			    struct drm_connector_state *conn_state)

			    const struct intel_crtc_state *pipe_config,

			    const struct drm_connector_state *conn_state)

{

	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);

	struct drm_device *dev = encoder->base.dev;
@@ -2914,16 +2914,16 @@ static void intel_enable_dp(struct intel_encoder *encoder, 
}



static void g4x_enable_dp(struct intel_encoder *encoder,

			  struct intel_crtc_state *pipe_config,

			  struct drm_connector_state *conn_state)

			  const struct intel_crtc_state *pipe_config,

			  const struct drm_connector_state *conn_state)

{

	intel_enable_dp(encoder, pipe_config, conn_state);

	intel_edp_backlight_on(pipe_config, conn_state);

}



static void vlv_enable_dp(struct intel_encoder *encoder,

			  struct intel_crtc_state *pipe_config,

			  struct drm_connector_state *conn_state)

			  const struct intel_crtc_state *pipe_config,

			  const struct drm_connector_state *conn_state)

{

	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
@@ -2932,8 +2932,8 @@ static void vlv_enable_dp(struct intel_encoder *encoder, 
}



static void g4x_pre_enable_dp(struct intel_encoder *encoder,

			      struct intel_crtc_state *pipe_config,

			      struct drm_connector_state *conn_state)

			      const struct intel_crtc_state *pipe_config,

			      const struct drm_connector_state *conn_state)

{

	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);

	enum port port = dp_to_dig_port(intel_dp)->port;
@@ -3055,8 +3055,8 @@ static void vlv_init_panel_power_sequencer(struct intel_dp *intel_dp) 
}



static void vlv_pre_enable_dp(struct intel_encoder *encoder,

			      struct intel_crtc_state *pipe_config,

			      struct drm_connector_state *conn_state)

			      const struct intel_crtc_state *pipe_config,

			      const struct drm_connector_state *conn_state)

{

	vlv_phy_pre_encoder_enable(encoder);
@@ -3064,8 +3064,8 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder, 
}



static void vlv_dp_pre_pll_enable(struct intel_encoder *encoder,

				  struct intel_crtc_state *pipe_config,

				  struct drm_connector_state *conn_state)

				  const struct intel_crtc_state *pipe_config,

				  const struct drm_connector_state *conn_state)

{

	intel_dp_prepare(encoder, pipe_config);
@@ -3073,8 +3073,8 @@ static void vlv_dp_pre_pll_enable(struct intel_encoder *encoder, 
}



static void chv_pre_enable_dp(struct intel_encoder *encoder,

			      struct intel_crtc_state *pipe_config,

			      struct drm_connector_state *conn_state)

			      const struct intel_crtc_state *pipe_config,

			      const struct drm_connector_state *conn_state)

{

	chv_phy_pre_encoder_enable(encoder);
@@ -3085,8 +3085,8 @@ static void chv_pre_enable_dp(struct intel_encoder *encoder, 
}



static void chv_dp_pre_pll_enable(struct intel_encoder *encoder,

				  struct intel_crtc_state *pipe_config,

				  struct drm_connector_state *conn_state)

				  const struct intel_crtc_state *pipe_config,

				  const struct drm_connector_state *conn_state)

{

	intel_dp_prepare(encoder, pipe_config);
@@ -3094,8 +3094,8 @@ static void chv_dp_pre_pll_enable(struct intel_encoder *encoder, 
}



static void chv_dp_post_pll_disable(struct intel_encoder *encoder,

				    struct intel_crtc_state *pipe_config,

				    struct drm_connector_state *conn_state)

				    const struct intel_crtc_state *pipe_config,

				    const struct drm_connector_state *conn_state)

{

	chv_phy_post_pll_disable(encoder);

}
@@ -5450,7 +5450,7 @@ static void intel_dp_pps_init(struct drm_device *dev, 
 * The caller of this function needs to take a lock on dev_priv->drrs.

 */

static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv,

				    struct intel_crtc_state *crtc_state,

				    const struct intel_crtc_state *crtc_state,

				    int refresh_rate)

{

	struct intel_encoder *encoder;
@@ -5547,7 +5547,7 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv, 
 * Initializes frontbuffer_bits and drrs.dp

 */

void intel_edp_drrs_enable(struct intel_dp *intel_dp,

			   struct intel_crtc_state *crtc_state)

			   const struct intel_crtc_state *crtc_state)

{

	struct drm_device *dev = intel_dp_to_dev(intel_dp);

	struct drm_i915_private *dev_priv = to_i915(dev);
@@ -5578,7 +5578,7 @@ unlock: 
 *

 */

void intel_edp_drrs_disable(struct intel_dp *intel_dp,

			    struct intel_crtc_state *old_crtc_state)

			    const struct intel_crtc_state *old_crtc_state)

{

	struct drm_device *dev = intel_dp_to_dev(intel_dp);

	struct drm_i915_private *dev_priv = to_i915(dev);

drivers/gpu/drm/i915/intel_dp_mst.c

+8 −8
Original line number Diff line number Diff line
@@ -123,8 +123,8 @@ static int intel_dp_mst_atomic_check(struct drm_connector *connector, 
}



static void intel_mst_disable_dp(struct intel_encoder *encoder,

				 struct intel_crtc_state *old_crtc_state,

				 struct drm_connector_state *old_conn_state)

				 const struct intel_crtc_state *old_crtc_state,

				 const struct drm_connector_state *old_conn_state)

{

	struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base);

	struct intel_digital_port *intel_dig_port = intel_mst->primary;
@@ -146,8 +146,8 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder, 
}



static void intel_mst_post_disable_dp(struct intel_encoder *encoder,

				      struct intel_crtc_state *old_crtc_state,

				      struct drm_connector_state *old_conn_state)

				      const struct intel_crtc_state *old_crtc_state,

				      const struct drm_connector_state *old_conn_state)

{

	struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base);

	struct intel_digital_port *intel_dig_port = intel_mst->primary;
@@ -176,8 +176,8 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder, 
}



static void intel_mst_pre_enable_dp(struct intel_encoder *encoder,

				    struct intel_crtc_state *pipe_config,

				    struct drm_connector_state *conn_state)

				    const struct intel_crtc_state *pipe_config,

				    const struct drm_connector_state *conn_state)

{

	struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base);

	struct intel_digital_port *intel_dig_port = intel_mst->primary;
@@ -219,8 +219,8 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder, 
}



static void intel_mst_enable_dp(struct intel_encoder *encoder,

				struct intel_crtc_state *pipe_config,

				struct drm_connector_state *conn_state)

				const struct intel_crtc_state *pipe_config,

				const struct drm_connector_state *conn_state)

{

	struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base);

	struct intel_digital_port *intel_dig_port = intel_mst->primary;

drivers/gpu/drm/i915/intel_drv.h

+16 −16
Original line number Diff line number Diff line
@@ -220,23 +220,23 @@ struct intel_encoder { 
			       struct intel_crtc_state *,

			       struct drm_connector_state *);

	void (*pre_pll_enable)(struct intel_encoder *,

			       struct intel_crtc_state *,

			       struct drm_connector_state *);

			       const struct intel_crtc_state *,

			       const struct drm_connector_state *);

	void (*pre_enable)(struct intel_encoder *,

			   struct intel_crtc_state *,

			   struct drm_connector_state *);

			   const struct intel_crtc_state *,

			   const struct drm_connector_state *);

	void (*enable)(struct intel_encoder *,

		       struct intel_crtc_state *,

		       struct drm_connector_state *);

		       const struct intel_crtc_state *,

		       const struct drm_connector_state *);

	void (*disable)(struct intel_encoder *,

			struct intel_crtc_state *,

			struct drm_connector_state *);

			const struct intel_crtc_state *,

			const struct drm_connector_state *);

	void (*post_disable)(struct intel_encoder *,

			     struct intel_crtc_state *,

			     struct drm_connector_state *);

			     const struct intel_crtc_state *,

			     const struct drm_connector_state *);

	void (*post_pll_disable)(struct intel_encoder *,

				 struct intel_crtc_state *,

				 struct drm_connector_state *);

				 const struct intel_crtc_state *,

				 const struct drm_connector_state *);

	/* Read out the current hw state of this connector, returning true if

	 * the encoder is active. If the encoder is enabled it also set the pipe

	 * it is connected to in the pipe parameter. */
@@ -1247,8 +1247,8 @@ void intel_crt_reset(struct drm_encoder *encoder); 


/* intel_ddi.c */

void intel_ddi_fdi_post_disable(struct intel_encoder *intel_encoder,

				struct intel_crtc_state *old_crtc_state,

				struct drm_connector_state *old_conn_state);

				const struct intel_crtc_state *old_crtc_state,

				const struct drm_connector_state *old_conn_state);

void hsw_fdi_link_train(struct intel_crtc *crtc,

			const struct intel_crtc_state *crtc_state);

void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port);
@@ -1520,9 +1520,9 @@ void intel_power_sequencer_reset(struct drm_i915_private *dev_priv); 
uint32_t intel_dp_pack_aux(const uint8_t *src, int src_bytes);

void intel_plane_destroy(struct drm_plane *plane);

void intel_edp_drrs_enable(struct intel_dp *intel_dp,

			   struct intel_crtc_state *crtc_state);

			   const struct intel_crtc_state *crtc_state);

void intel_edp_drrs_disable(struct intel_dp *intel_dp,

			   struct intel_crtc_state *crtc_state);

			    const struct intel_crtc_state *crtc_state);

void intel_edp_drrs_invalidate(struct drm_i915_private *dev_priv,

			       unsigned int frontbuffer_bits);

void intel_edp_drrs_flush(struct drm_i915_private *dev_priv,

CRA Git | Maintained and supported by SUSTech CRA and CCSE