[Intel-gfx] [PATCH v2 8/8] drm/i915: Constify states passed to enable/disable/etc. encoder hooks
Rodrigo Vivi
rodrigo.vivi at gmail.com
Fri Aug 18 00:41:46 UTC 2017
On Fri, May 19, 2017 at 04:17:25PM +0300, ville.syrjala at linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> 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).
That makes total sense. I didn't check all functions to see if no one
is ofending them though.
Acked-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
>
> v2: Update intel_tv_mode_find() and ironlake_edp_pll_on() as well
>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_crt.c | 22 ++++++------
> drivers/gpu/drm/i915/intel_ddi.c | 30 ++++++++--------
> drivers/gpu/drm/i915/intel_dp.c | 64 ++++++++++++++++-----------------
> drivers/gpu/drm/i915/intel_dp_mst.c | 16 ++++-----
> drivers/gpu/drm/i915/intel_drv.h | 32 ++++++++---------
> drivers/gpu/drm/i915/intel_dsi.c | 22 ++++++------
> drivers/gpu/drm/i915/intel_dvo.c | 12 +++----
> drivers/gpu/drm/i915/intel_hdmi.c | 70 ++++++++++++++++++-------------------
> drivers/gpu/drm/i915/intel_lvds.c | 24 ++++++-------
> drivers/gpu/drm/i915/intel_sdvo.c | 24 ++++++-------
> drivers/gpu/drm/i915/intel_tv.c | 14 ++++----
> 11 files changed, 165 insertions(+), 165 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
> index 84a1f5e85153..94b9a2eeb0b2 100644
> --- a/drivers/gpu/drm/i915/intel_crt.c
> +++ b/drivers/gpu/drm/i915/intel_crt.c
> @@ -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);
> }
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index 6203c2da3daf..21aa5eab292c 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -644,7 +644,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:
> @@ -1617,7 +1617,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);
> @@ -1676,7 +1676,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;
> @@ -1703,8 +1703,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;
>
> @@ -1725,8 +1725,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);
> @@ -1782,8 +1782,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;
> @@ -1815,8 +1815,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);
> @@ -1856,8 +1856,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;
> @@ -1881,8 +1881,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;
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 1784989ca478..2ba3340710a9 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1837,7 +1837,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);
> @@ -2432,7 +2432,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);
> @@ -2659,8 +2659,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);
> @@ -2684,8 +2684,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;
> @@ -2698,8 +2698,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);
>
> @@ -2707,8 +2707,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;
> @@ -2813,7 +2813,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);
> @@ -2837,8 +2837,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;
> @@ -2885,8 +2885,8 @@ 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)
> {
> struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
>
> @@ -2895,8 +2895,8 @@ static void g4x_enable_dp(struct intel_encoder *encoder,
> }
>
> 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);
>
> @@ -2905,8 +2905,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;
> @@ -3028,8 +3028,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);
>
> @@ -3037,8 +3037,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);
>
> @@ -3046,8 +3046,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);
>
> @@ -3058,8 +3058,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);
>
> @@ -3067,8 +3067,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);
> }
> @@ -5462,7 +5462,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;
> @@ -5559,7 +5559,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);
> @@ -5590,7 +5590,7 @@ void intel_edp_drrs_enable(struct intel_dp *intel_dp,
> *
> */
> 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);
> diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
> index 68c788eb0b95..d507b5aebb63 100644
> --- a/drivers/gpu/drm/i915/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
> @@ -119,8 +119,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;
> @@ -142,8 +142,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;
> @@ -172,8 +172,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;
> @@ -215,8 +215,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;
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 534a5bfb273e..7d533cb02afe 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -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. */
> @@ -1270,8 +1270,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);
> @@ -1542,9 +1542,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,
> diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
> index fc0ef492252a..1d1579f5cb90 100644
> --- a/drivers/gpu/drm/i915/intel_dsi.c
> +++ b/drivers/gpu/drm/i915/intel_dsi.c
> @@ -711,7 +711,7 @@ static void intel_dsi_port_disable(struct intel_encoder *encoder)
> }
>
> static void intel_dsi_prepare(struct intel_encoder *intel_encoder,
> - struct intel_crtc_state *pipe_config);
> + const struct intel_crtc_state *pipe_config);
> static void intel_dsi_unprepare(struct intel_encoder *encoder);
>
> static void intel_dsi_msleep(struct intel_dsi *intel_dsi, int msec)
> @@ -763,8 +763,8 @@ static void intel_dsi_msleep(struct intel_dsi *intel_dsi, int msec)
> */
>
> static void intel_dsi_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)
> {
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
> @@ -844,8 +844,8 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder,
> * the pre_enable hook.
> */
> static void intel_dsi_enable_nop(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)
> {
> DRM_DEBUG_KMS("\n");
> }
> @@ -855,8 +855,8 @@ static void intel_dsi_enable_nop(struct intel_encoder *encoder,
> * the post_disable hook.
> */
> static void intel_dsi_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_device *dev = encoder->base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> @@ -902,8 +902,8 @@ static void intel_dsi_clear_device_ready(struct intel_encoder *encoder)
> }
>
> static void intel_dsi_post_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)
> {
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
> @@ -1043,7 +1043,7 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder,
> }
>
> static void bxt_dsi_get_pipe_config(struct intel_encoder *encoder,
> - struct intel_crtc_state *pipe_config)
> + struct intel_crtc_state *pipe_config)
> {
> struct drm_device *dev = encoder->base.dev;
> struct drm_i915_private *dev_priv = to_i915(dev);
> @@ -1347,7 +1347,7 @@ static u32 pixel_format_to_reg(enum mipi_dsi_pixel_format fmt)
> }
>
> static void intel_dsi_prepare(struct intel_encoder *intel_encoder,
> - struct intel_crtc_state *pipe_config)
> + const struct intel_crtc_state *pipe_config)
> {
> struct drm_encoder *encoder = &intel_encoder->base;
> struct drm_device *dev = encoder->dev;
> diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
> index c1544a53095d..47a5ab4e6fb3 100644
> --- a/drivers/gpu/drm/i915/intel_dvo.c
> +++ b/drivers/gpu/drm/i915/intel_dvo.c
> @@ -175,8 +175,8 @@ static void intel_dvo_get_config(struct intel_encoder *encoder,
> }
>
> static void intel_disable_dvo(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);
> struct intel_dvo *intel_dvo = enc_to_dvo(encoder);
> @@ -189,8 +189,8 @@ static void intel_disable_dvo(struct intel_encoder *encoder,
> }
>
> static void intel_enable_dvo(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 drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> struct intel_dvo *intel_dvo = enc_to_dvo(encoder);
> @@ -258,8 +258,8 @@ static bool intel_dvo_compute_config(struct intel_encoder *encoder,
> }
>
> static void intel_dvo_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)
> {
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> struct intel_crtc *crtc = to_intel_crtc(pipe_config->base.crtc);
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index 47a9f7f98a62..cfa7061cb5ab 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -989,8 +989,8 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder,
> }
>
> static void intel_enable_hdmi_audio(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_crtc *crtc = to_intel_crtc(pipe_config->base.crtc);
>
> @@ -1001,8 +1001,8 @@ static void intel_enable_hdmi_audio(struct intel_encoder *encoder,
> }
>
> static void g4x_enable_hdmi(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 drm_device *dev = encoder->base.dev;
> struct drm_i915_private *dev_priv = to_i915(dev);
> @@ -1023,8 +1023,8 @@ static void g4x_enable_hdmi(struct intel_encoder *encoder,
> }
>
> static void ibx_enable_hdmi(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 drm_device *dev = encoder->base.dev;
> struct drm_i915_private *dev_priv = to_i915(dev);
> @@ -1073,8 +1073,8 @@ static void ibx_enable_hdmi(struct intel_encoder *encoder,
> }
>
> static void cpt_enable_hdmi(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 drm_device *dev = encoder->base.dev;
> struct drm_i915_private *dev_priv = to_i915(dev);
> @@ -1128,14 +1128,14 @@ static void cpt_enable_hdmi(struct intel_encoder *encoder,
> }
>
> static void vlv_enable_hdmi(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)
> {
> }
>
> static void intel_disable_hdmi(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_device *dev = encoder->base.dev;
> struct drm_i915_private *dev_priv = to_i915(dev);
> @@ -1191,8 +1191,8 @@ static void intel_disable_hdmi(struct intel_encoder *encoder,
> }
>
> static void g4x_disable_hdmi(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)
> {
> if (old_crtc_state->has_audio)
> intel_audio_codec_disable(encoder);
> @@ -1201,16 +1201,16 @@ static void g4x_disable_hdmi(struct intel_encoder *encoder,
> }
>
> static void pch_disable_hdmi(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)
> {
> if (old_crtc_state->has_audio)
> intel_audio_codec_disable(encoder);
> }
>
> static void pch_post_disable_hdmi(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_hdmi(encoder, old_crtc_state, old_conn_state);
> }
> @@ -1308,7 +1308,7 @@ intel_hdmi_mode_valid(struct drm_connector *connector,
> return status;
> }
>
> -static bool hdmi_12bpc_possible(struct intel_crtc_state *crtc_state)
> +static bool hdmi_12bpc_possible(const struct intel_crtc_state *crtc_state)
> {
> struct drm_i915_private *dev_priv =
> to_i915(crtc_state->base.crtc->dev);
> @@ -1678,8 +1678,8 @@ intel_hdmi_set_property(struct drm_connector *connector,
> }
>
> static void intel_hdmi_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)
> {
> struct intel_digital_port *intel_dig_port =
> enc_to_dig_port(&encoder->base);
> @@ -1692,8 +1692,8 @@ static void intel_hdmi_pre_enable(struct intel_encoder *encoder,
> }
>
> static void vlv_hdmi_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)
> {
> struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
> struct drm_device *dev = encoder->base.dev;
> @@ -1715,8 +1715,8 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder,
> }
>
> static void vlv_hdmi_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_hdmi_prepare(encoder, pipe_config);
>
> @@ -1724,8 +1724,8 @@ static void vlv_hdmi_pre_pll_enable(struct intel_encoder *encoder,
> }
>
> static void chv_hdmi_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_hdmi_prepare(encoder, pipe_config);
>
> @@ -1733,23 +1733,23 @@ static void chv_hdmi_pre_pll_enable(struct intel_encoder *encoder,
> }
>
> static void chv_hdmi_post_pll_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)
> {
> chv_phy_post_pll_disable(encoder);
> }
>
> static void vlv_hdmi_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)
> {
> /* Reset lanes to avoid HDMI flicker (VLV w/a) */
> vlv_phy_reset_lanes(encoder);
> }
>
> static void chv_hdmi_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_device *dev = encoder->base.dev;
> struct drm_i915_private *dev_priv = to_i915(dev);
> @@ -1763,8 +1763,8 @@ static void chv_hdmi_post_disable(struct intel_encoder *encoder,
> }
>
> static void chv_hdmi_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)
> {
> struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
> struct drm_device *dev = encoder->base.dev;
> diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
> index 8b942ef2b3ec..29fd80e16feb 100644
> --- a/drivers/gpu/drm/i915/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/intel_lvds.c
> @@ -229,8 +229,8 @@ static void intel_lvds_pps_init_hw(struct drm_i915_private *dev_priv,
> }
>
> static void intel_pre_enable_lvds(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_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base);
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> @@ -306,8 +306,8 @@ static void intel_pre_enable_lvds(struct intel_encoder *encoder,
> * Sets the power state for the panel.
> */
> static void intel_enable_lvds(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 drm_device *dev = encoder->base.dev;
> struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base);
> @@ -326,8 +326,8 @@ static void intel_enable_lvds(struct intel_encoder *encoder,
> }
>
> static void intel_disable_lvds(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_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base);
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> @@ -341,8 +341,8 @@ static void intel_disable_lvds(struct intel_encoder *encoder,
> }
>
> static void gmch_disable_lvds(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_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base);
> @@ -355,8 +355,8 @@ static void gmch_disable_lvds(struct intel_encoder *encoder,
> }
>
> static void pch_disable_lvds(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_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base);
> struct intel_connector *intel_connector =
> @@ -366,8 +366,8 @@ static void pch_disable_lvds(struct intel_encoder *encoder,
> }
>
> static void pch_post_disable_lvds(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_lvds(encoder, old_crtc_state, old_conn_state);
> }
> diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
> index 6cc181203135..d17b5814eb69 100644
> --- a/drivers/gpu/drm/i915/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> @@ -998,7 +998,7 @@ static bool intel_sdvo_write_infoframe(struct intel_sdvo *intel_sdvo,
> }
>
> static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo,
> - struct intel_crtc_state *pipe_config)
> + const struct intel_crtc_state *pipe_config)
> {
> uint8_t sdvo_data[HDMI_INFOFRAME_SIZE(AVI)];
> union hdmi_infoframe frame;
> @@ -1187,13 +1187,13 @@ static bool intel_sdvo_compute_config(struct intel_encoder *encoder,
> }
>
> static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder,
> - struct intel_crtc_state *crtc_state,
> - struct drm_connector_state *conn_state)
> + const struct intel_crtc_state *crtc_state,
> + const struct drm_connector_state *conn_state)
> {
> struct drm_i915_private *dev_priv = to_i915(intel_encoder->base.dev);
> struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
> const struct drm_display_mode *adjusted_mode = &crtc_state->base.adjusted_mode;
> - struct drm_display_mode *mode = &crtc_state->base.mode;
> + const struct drm_display_mode *mode = &crtc_state->base.mode;
> struct intel_sdvo *intel_sdvo = to_sdvo(intel_encoder);
> u32 sdvox;
> struct intel_sdvo_in_out_map in_out;
> @@ -1428,8 +1428,8 @@ static void intel_sdvo_get_config(struct intel_encoder *encoder,
> }
>
> static void intel_disable_sdvo(struct intel_encoder *encoder,
> - struct intel_crtc_state *old_crtc_state,
> - struct drm_connector_state *conn_state)
> + const struct intel_crtc_state *old_crtc_state,
> + const struct drm_connector_state *conn_state)
> {
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> struct intel_sdvo *intel_sdvo = to_sdvo(encoder);
> @@ -1473,21 +1473,21 @@ static void intel_disable_sdvo(struct intel_encoder *encoder,
> }
>
> static void pch_disable_sdvo(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_sdvo(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_sdvo(encoder, old_crtc_state, old_conn_state);
> }
>
> static void intel_enable_sdvo(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 drm_device *dev = encoder->base.dev;
> struct drm_i915_private *dev_priv = to_i915(dev);
> diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
> index 784df024e230..8af58caeae91 100644
> --- a/drivers/gpu/drm/i915/intel_tv.c
> +++ b/drivers/gpu/drm/i915/intel_tv.c
> @@ -814,8 +814,8 @@ intel_tv_get_hw_state(struct intel_encoder *encoder, enum pipe *pipe)
>
> static void
> intel_enable_tv(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 drm_device *dev = encoder->base.dev;
> struct drm_i915_private *dev_priv = to_i915(dev);
> @@ -829,8 +829,8 @@ intel_enable_tv(struct intel_encoder *encoder,
>
> static void
> intel_disable_tv(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_device *dev = encoder->base.dev;
> struct drm_i915_private *dev_priv = to_i915(dev);
> @@ -838,7 +838,7 @@ intel_disable_tv(struct intel_encoder *encoder,
> I915_WRITE(TV_CTL, I915_READ(TV_CTL) & ~TV_ENC_ENABLE);
> }
>
> -static const struct tv_mode *intel_tv_mode_find(struct drm_connector_state *conn_state)
> +static const struct tv_mode *intel_tv_mode_find(const struct drm_connector_state *conn_state)
> {
> int format = conn_state->tv.mode;
>
> @@ -976,8 +976,8 @@ static void set_color_conversion(struct drm_i915_private *dev_priv,
> }
>
> static void intel_tv_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)
> {
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
> --
> 2.10.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
More information about the Intel-gfx
mailing list