From: Mika Kahola <mika.kahola@intel.com>
To: ville.syrjala@linux.intel.com
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 6/7] drm/i915: Constify adjusted_mode
Date: Thu, 24 Sep 2015 11:10:16 +0300 [thread overview]
Message-ID: <1443082216.3303.15.camel@sorvi> (raw)
In-Reply-To: <1441708851-24646-7-git-send-email-ville.syrjala@linux.intel.com>
Reviewed-by: Mika Kahola <mika.kahola@intel.com>
On Tue, 2015-09-08 at 13:40 +0300, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Make adjusted_mode const whereever we don't have to modify it. This only
> covers cases when we have a local adjusted_mode variable, and doesn't
> make any difference for cases where we just dereference
> pipe_config->adjusted_mode.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/dvo.h | 4 ++--
> drivers/gpu/drm/i915/dvo_ch7017.c | 4 ++--
> drivers/gpu/drm/i915/dvo_ch7xxx.c | 4 ++--
> drivers/gpu/drm/i915/dvo_ivch.c | 4 ++--
> drivers/gpu/drm/i915/dvo_ns2501.c | 4 ++--
> drivers/gpu/drm/i915/dvo_sil164.c | 4 ++--
> drivers/gpu/drm/i915/dvo_tfp410.c | 4 ++--
> drivers/gpu/drm/i915/intel_audio.c | 2 +-
> drivers/gpu/drm/i915/intel_crt.c | 2 +-
> drivers/gpu/drm/i915/intel_display.c | 8 ++++----
> drivers/gpu/drm/i915/intel_dp.c | 2 +-
> drivers/gpu/drm/i915/intel_dp_mst.c | 2 +-
> drivers/gpu/drm/i915/intel_drv.h | 2 +-
> drivers/gpu/drm/i915/intel_dsi.c | 2 +-
> drivers/gpu/drm/i915/intel_dvo.c | 2 +-
> drivers/gpu/drm/i915/intel_hdmi.c | 22 +++++++++++-----------
> drivers/gpu/drm/i915/intel_panel.c | 14 ++++----------
> drivers/gpu/drm/i915/intel_pm.c | 9 +++------
> drivers/gpu/drm/i915/intel_sdvo.c | 2 +-
> 19 files changed, 44 insertions(+), 53 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/dvo.h b/drivers/gpu/drm/i915/dvo.h
> index 3121633..0e2c1b9 100644
> --- a/drivers/gpu/drm/i915/dvo.h
> +++ b/drivers/gpu/drm/i915/dvo.h
> @@ -94,8 +94,8 @@ struct intel_dvo_dev_ops {
> * after this function is called.
> */
> void (*mode_set)(struct intel_dvo_device *dvo,
> - struct drm_display_mode *mode,
> - struct drm_display_mode *adjusted_mode);
> + const struct drm_display_mode *mode,
> + const struct drm_display_mode *adjusted_mode);
>
> /*
> * Probe for a connected output, and return detect_status.
> diff --git a/drivers/gpu/drm/i915/dvo_ch7017.c b/drivers/gpu/drm/i915/dvo_ch7017.c
> index 86b27d1..cbb2202 100644
> --- a/drivers/gpu/drm/i915/dvo_ch7017.c
> +++ b/drivers/gpu/drm/i915/dvo_ch7017.c
> @@ -255,8 +255,8 @@ static enum drm_mode_status ch7017_mode_valid(struct intel_dvo_device *dvo,
> }
>
> static void ch7017_mode_set(struct intel_dvo_device *dvo,
> - struct drm_display_mode *mode,
> - struct drm_display_mode *adjusted_mode)
> + const struct drm_display_mode *mode,
> + const struct drm_display_mode *adjusted_mode)
> {
> uint8_t lvds_pll_feedback_div, lvds_pll_vco_control;
> uint8_t outputs_enable, lvds_control_2, lvds_power_down;
> diff --git a/drivers/gpu/drm/i915/dvo_ch7xxx.c b/drivers/gpu/drm/i915/dvo_ch7xxx.c
> index 80449f4..4b4acc1 100644
> --- a/drivers/gpu/drm/i915/dvo_ch7xxx.c
> +++ b/drivers/gpu/drm/i915/dvo_ch7xxx.c
> @@ -275,8 +275,8 @@ static enum drm_mode_status ch7xxx_mode_valid(struct intel_dvo_device *dvo,
> }
>
> static void ch7xxx_mode_set(struct intel_dvo_device *dvo,
> - struct drm_display_mode *mode,
> - struct drm_display_mode *adjusted_mode)
> + const struct drm_display_mode *mode,
> + const struct drm_display_mode *adjusted_mode)
> {
> uint8_t tvco, tpcp, tpd, tlpf, idf;
>
> diff --git a/drivers/gpu/drm/i915/dvo_ivch.c b/drivers/gpu/drm/i915/dvo_ivch.c
> index e082f75..ff9f1b0 100644
> --- a/drivers/gpu/drm/i915/dvo_ivch.c
> +++ b/drivers/gpu/drm/i915/dvo_ivch.c
> @@ -394,8 +394,8 @@ static bool ivch_get_hw_state(struct intel_dvo_device *dvo)
> }
>
> static void ivch_mode_set(struct intel_dvo_device *dvo,
> - struct drm_display_mode *mode,
> - struct drm_display_mode *adjusted_mode)
> + const struct drm_display_mode *mode,
> + const struct drm_display_mode *adjusted_mode)
> {
> struct ivch_priv *priv = dvo->dev_priv;
> uint16_t vr40 = 0;
> diff --git a/drivers/gpu/drm/i915/dvo_ns2501.c b/drivers/gpu/drm/i915/dvo_ns2501.c
> index 97ae8aa..063859f 100644
> --- a/drivers/gpu/drm/i915/dvo_ns2501.c
> +++ b/drivers/gpu/drm/i915/dvo_ns2501.c
> @@ -546,8 +546,8 @@ static enum drm_mode_status ns2501_mode_valid(struct intel_dvo_device *dvo,
> }
>
> static void ns2501_mode_set(struct intel_dvo_device *dvo,
> - struct drm_display_mode *mode,
> - struct drm_display_mode *adjusted_mode)
> + const struct drm_display_mode *mode,
> + const struct drm_display_mode *adjusted_mode)
> {
> const struct ns2501_configuration *conf;
> struct ns2501_priv *ns = (struct ns2501_priv *)(dvo->dev_priv);
> diff --git a/drivers/gpu/drm/i915/dvo_sil164.c b/drivers/gpu/drm/i915/dvo_sil164.c
> index fa01149..26f13eb 100644
> --- a/drivers/gpu/drm/i915/dvo_sil164.c
> +++ b/drivers/gpu/drm/i915/dvo_sil164.c
> @@ -190,8 +190,8 @@ static enum drm_mode_status sil164_mode_valid(struct intel_dvo_device *dvo,
> }
>
> static void sil164_mode_set(struct intel_dvo_device *dvo,
> - struct drm_display_mode *mode,
> - struct drm_display_mode *adjusted_mode)
> + const struct drm_display_mode *mode,
> + const struct drm_display_mode *adjusted_mode)
> {
> /* As long as the basics are set up, since we don't have clock
> * dependencies in the mode setup, we can just leave the
> diff --git a/drivers/gpu/drm/i915/dvo_tfp410.c b/drivers/gpu/drm/i915/dvo_tfp410.c
> index 7853719..6f1a0a6 100644
> --- a/drivers/gpu/drm/i915/dvo_tfp410.c
> +++ b/drivers/gpu/drm/i915/dvo_tfp410.c
> @@ -222,8 +222,8 @@ static enum drm_mode_status tfp410_mode_valid(struct intel_dvo_device *dvo,
> }
>
> static void tfp410_mode_set(struct intel_dvo_device *dvo,
> - struct drm_display_mode *mode,
> - struct drm_display_mode *adjusted_mode)
> + const struct drm_display_mode *mode,
> + const struct drm_display_mode *adjusted_mode)
> {
> /* As long as the basics are set up, since we don't have clock dependencies
> * in the mode setup, we can just leave the registers alone and everything
> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
> index 5848a50..1f6fbb4 100644
> --- a/drivers/gpu/drm/i915/intel_audio.c
> +++ b/drivers/gpu/drm/i915/intel_audio.c
> @@ -397,7 +397,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)
> {
> struct drm_encoder *encoder = &intel_encoder->base;
> struct intel_crtc *crtc = to_intel_crtc(encoder->crtc);
> - struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
> + const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
> struct drm_connector *connector;
> struct drm_device *dev = encoder->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
> index af5e43b..601a805 100644
> --- a/drivers/gpu/drm/i915/intel_crt.c
> +++ b/drivers/gpu/drm/i915/intel_crt.c
> @@ -158,7 +158,7 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder, int mode)
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_crt *crt = intel_encoder_to_crt(encoder);
> struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
> - struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
> + const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
> u32 adpa;
>
> if (INTEL_INFO(dev)->gen >= 5)
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index f83e25d..761d75a 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4348,7 +4348,7 @@ skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach,
> int skl_update_scaler_crtc(struct intel_crtc_state *state)
> {
> struct intel_crtc *intel_crtc = to_intel_crtc(state->base.crtc);
> - struct drm_display_mode *adjusted_mode = &state->base.adjusted_mode;
> + const struct drm_display_mode *adjusted_mode = &state->base.adjusted_mode;
>
> DRM_DEBUG_KMS("Updating scaler for [CRTC:%i] scaler_user index %u.%u\n",
> intel_crtc->base.base.id, intel_crtc->pipe, SKL_CRTC_INDEX);
> @@ -6427,7 +6427,7 @@ static int ironlake_fdi_compute_config(struct intel_crtc *intel_crtc,
> struct intel_crtc_state *pipe_config)
> {
> struct drm_device *dev = intel_crtc->base.dev;
> - struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
> + const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
> int lane, link_bw, fdi_dotclock, ret;
> bool needs_recompute = false;
>
> @@ -6506,7 +6506,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,
> {
> struct drm_device *dev = crtc->base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> - struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
> + const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
>
> /* FIXME should check pixel clock limits on all platforms */
> if (INTEL_INFO(dev)->gen < 4) {
> @@ -7574,7 +7574,7 @@ static void intel_set_pipe_timings(struct intel_crtc *intel_crtc)
> struct drm_i915_private *dev_priv = dev->dev_private;
> enum pipe pipe = intel_crtc->pipe;
> enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder;
> - struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;
> + const struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;
> uint32_t crtc_vtotal, crtc_vblank_end;
> int vsyncshift = 0;
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 45ab25e..9b04c29 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1586,7 +1586,7 @@ static void intel_dp_prepare(struct intel_encoder *encoder)
> struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
> enum port port = dp_to_dig_port(intel_dp)->port;
> struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
> - struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
> + const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
>
> intel_dp_set_link_params(intel_dp, crtc->config);
>
> diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
> index dc2f67e..8684d6c 100644
> --- a/drivers/gpu/drm/i915/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
> @@ -40,7 +40,7 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
> struct drm_atomic_state *state;
> int bpp, i;
> int lane_count, slots;
> - struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
> + const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
> struct drm_connector *drm_connector;
> struct intel_connector *connector, *found = NULL;
> struct drm_connector_state *connector_state;
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 46484e4..5c80cf7 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -674,7 +674,7 @@ struct intel_hdmi {
> const void *frame, ssize_t len);
> void (*set_infoframes)(struct drm_encoder *encoder,
> bool enable,
> - struct drm_display_mode *adjusted_mode);
> + const struct drm_display_mode *adjusted_mode);
> bool (*infoframe_enabled)(struct drm_encoder *encoder);
> };
>
> diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
> index 2d4ecfb..ba36010 100644
> --- a/drivers/gpu/drm/i915/intel_dsi.c
> +++ b/drivers/gpu/drm/i915/intel_dsi.c
> @@ -759,7 +759,7 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder)
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
> struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
> - struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;
> + const struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;
> enum port port;
> unsigned int bpp = intel_crtc->config->pipe_bpp;
> u32 val, tmp;
> diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
> index 555afbc..8492053 100644
> --- a/drivers/gpu/drm/i915/intel_dvo.c
> +++ b/drivers/gpu/drm/i915/intel_dvo.c
> @@ -251,7 +251,7 @@ static void intel_dvo_pre_enable(struct intel_encoder *encoder)
> struct drm_device *dev = encoder->base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
> - struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
> + const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
> struct intel_dvo *intel_dvo = enc_to_dvo(encoder);
> int pipe = crtc->pipe;
> u32 dvo_val;
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index e03dca0..adbbc7b 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -447,7 +447,7 @@ static void intel_write_infoframe(struct drm_encoder *encoder,
> }
>
> static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder,
> - struct drm_display_mode *adjusted_mode)
> + const struct drm_display_mode *adjusted_mode)
> {
> struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
> struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
> @@ -491,7 +491,7 @@ static void intel_hdmi_set_spd_infoframe(struct drm_encoder *encoder)
>
> static void
> intel_hdmi_set_hdmi_infoframe(struct drm_encoder *encoder,
> - struct drm_display_mode *adjusted_mode)
> + const struct drm_display_mode *adjusted_mode)
> {
> union hdmi_infoframe frame;
> int ret;
> @@ -506,7 +506,7 @@ intel_hdmi_set_hdmi_infoframe(struct drm_encoder *encoder,
>
> static void g4x_set_infoframes(struct drm_encoder *encoder,
> bool enable,
> - struct drm_display_mode *adjusted_mode)
> + const struct drm_display_mode *adjusted_mode)
> {
> struct drm_i915_private *dev_priv = encoder->dev->dev_private;
> struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
> @@ -658,7 +658,7 @@ static bool intel_hdmi_set_gcp_infoframe(struct drm_encoder *encoder)
>
> static void ibx_set_infoframes(struct drm_encoder *encoder,
> bool enable,
> - struct drm_display_mode *adjusted_mode)
> + const struct drm_display_mode *adjusted_mode)
> {
> struct drm_i915_private *dev_priv = encoder->dev->dev_private;
> struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
> @@ -710,7 +710,7 @@ static void ibx_set_infoframes(struct drm_encoder *encoder,
>
> static void cpt_set_infoframes(struct drm_encoder *encoder,
> bool enable,
> - struct drm_display_mode *adjusted_mode)
> + const struct drm_display_mode *adjusted_mode)
> {
> struct drm_i915_private *dev_priv = encoder->dev->dev_private;
> struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
> @@ -752,7 +752,7 @@ static void cpt_set_infoframes(struct drm_encoder *encoder,
>
> static void vlv_set_infoframes(struct drm_encoder *encoder,
> bool enable,
> - struct drm_display_mode *adjusted_mode)
> + const struct drm_display_mode *adjusted_mode)
> {
> struct drm_i915_private *dev_priv = encoder->dev->dev_private;
> struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
> @@ -804,7 +804,7 @@ static void vlv_set_infoframes(struct drm_encoder *encoder,
>
> static void hsw_set_infoframes(struct drm_encoder *encoder,
> bool enable,
> - struct drm_display_mode *adjusted_mode)
> + const struct drm_display_mode *adjusted_mode)
> {
> struct drm_i915_private *dev_priv = encoder->dev->dev_private;
> struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
> @@ -841,7 +841,7 @@ static void intel_hdmi_prepare(struct intel_encoder *encoder)
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
> struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);
> - struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
> + const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
> u32 hdmi_val;
>
> hdmi_val = SDVO_ENCODING_HDMI;
> @@ -1523,7 +1523,7 @@ static void intel_hdmi_pre_enable(struct intel_encoder *encoder)
> {
> struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);
> struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
> - struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;
> + const struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;
>
> intel_hdmi_prepare(encoder);
>
> @@ -1540,7 +1540,7 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_crtc *intel_crtc =
> to_intel_crtc(encoder->base.crtc);
> - struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;
> + const struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;
> enum dpio_channel port = vlv_dport_to_channel(dport);
> int pipe = intel_crtc->pipe;
> u32 val;
> @@ -1806,7 +1806,7 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder)
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_crtc *intel_crtc =
> to_intel_crtc(encoder->base.crtc);
> - struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;
> + const struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;
> enum dpio_channel ch = vlv_dport_to_channel(dport);
> int pipe = intel_crtc->pipe;
> int data, i, stagger;
> diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
> index 83ec94a..eda9b8c 100644
> --- a/drivers/gpu/drm/i915/intel_panel.c
> +++ b/drivers/gpu/drm/i915/intel_panel.c
> @@ -105,12 +105,8 @@ intel_pch_panel_fitting(struct intel_crtc *intel_crtc,
> struct intel_crtc_state *pipe_config,
> int fitting_mode)
> {
> - struct drm_display_mode *adjusted_mode;
> - int x, y, width, height;
> -
> - adjusted_mode = &pipe_config->base.adjusted_mode;
> -
> - x = y = width = height = 0;
> + const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
> + int x = 0, y = 0, width = 0, height = 0;
>
> /* Native modes don't need fitting */
> if (adjusted_mode->crtc_hdisplay == pipe_config->pipe_src_w &&
> @@ -230,7 +226,7 @@ static inline u32 panel_fitter_scaling(u32 source, u32 target)
> static void i965_scale_aspect(struct intel_crtc_state *pipe_config,
> u32 *pfit_control)
> {
> - struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
> + const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
> u32 scaled_width = adjusted_mode->crtc_hdisplay *
> pipe_config->pipe_src_h;
> u32 scaled_height = pipe_config->pipe_src_w *
> @@ -310,9 +306,7 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc,
> {
> struct drm_device *dev = intel_crtc->base.dev;
> u32 pfit_control = 0, pfit_pgm_ratios = 0, border = 0;
> - struct drm_display_mode *adjusted_mode;
> -
> - adjusted_mode = &pipe_config->base.adjusted_mode;
> + struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
>
> /* Native modes don't need fitting */
> if (adjusted_mode->crtc_hdisplay == pipe_config->pipe_src_w &&
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 7aa9a4e..797f157 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -697,12 +697,9 @@ static void pineview_update_wm(struct drm_crtc *unused_crtc)
>
> crtc = single_enabled_crtc(dev);
> if (crtc) {
> - const struct drm_display_mode *adjusted_mode;
> + const struct drm_display_mode *adjusted_mode = &to_intel_crtc(crtc)->config->base.adjusted_mode;
> int pixel_size = crtc->primary->state->fb->bits_per_pixel / 8;
> - int clock;
> -
> - adjusted_mode = &to_intel_crtc(crtc)->config->base.adjusted_mode;
> - clock = adjusted_mode->crtc_clock;
> + int clock = adjusted_mode->crtc_clock;
>
> /* Display SR */
> wm = intel_calculate_wm(clock, &pineview_display_wm,
> @@ -2084,7 +2081,7 @@ hsw_compute_linetime_wm(struct drm_device *dev, struct drm_crtc *crtc)
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> - struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;
> + const struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;
> u32 linetime, ips_linetime;
>
> if (!intel_crtc->active)
> diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
> index 810e0bb..b8ed706 100644
> --- a/drivers/gpu/drm/i915/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> @@ -1189,7 +1189,7 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder)
> struct drm_device *dev = intel_encoder->base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_crtc *crtc = to_intel_crtc(intel_encoder->base.crtc);
> - struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
> + const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
> struct drm_display_mode *mode = &crtc->config->base.mode;
> struct intel_sdvo *intel_sdvo = to_sdvo(intel_encoder);
> u32 sdvox;
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-09-24 8:09 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-08 10:40 [PATCH 0/7] drm/i915: Always use crtc_ timings with adjusted_mode ville.syrjala
2015-09-08 10:40 ` [PATCH 1/7] drm/i915: Use intel_panel for DVO fixed mode handling ville.syrjala
2015-09-24 8:00 ` Mika Kahola
2015-09-08 10:40 ` [PATCH 2/7] drm/i915: Always call the adjusted mode 'adjusted_mode' ville.syrjala
2015-09-24 8:01 ` Mika Kahola
2015-09-28 8:03 ` Daniel Vetter
2015-09-08 10:40 ` [PATCH 3/7] drm/i915: s/mode/adjusted_mode/ in functions that really get passed the adjusted_mode ville.syrjala
2015-09-23 11:12 ` Mika Kahola
2015-09-23 12:30 ` Ville Syrjälä
2015-09-24 8:06 ` Mika Kahola
2015-09-25 13:37 ` [PATCH v2 " ville.syrjala
2015-09-28 12:15 ` Mika Kahola
2015-09-08 10:40 ` [PATCH 4/7] drm/i915: Always use crtc_ timings when dealing with adjustead_mode ville.syrjala
2015-09-24 8:08 ` Mika Kahola
2015-09-25 13:38 ` [PATCH v2 " ville.syrjala
2015-09-28 12:15 ` Mika Kahola
2015-09-08 10:40 ` [PATCH 5/7] drm/i915: Move HDMI aspect ratio setup to .compute_config() ville.syrjala
2015-09-24 8:08 ` Mika Kahola
2015-09-08 10:40 ` [PATCH 6/7] drm/i915: Constify adjusted_mode ville.syrjala
2015-09-24 8:10 ` Mika Kahola [this message]
2015-09-08 10:40 ` [PATCH 7/7] drm/i915: Add HDMI aspect ration property for SDVO ville.syrjala
2015-09-08 10:43 ` Ville Syrjälä
2015-09-08 10:40 ` [PATCH 7/7] drm/i915: Add HDMI aspect ratio " ville.syrjala
2015-09-25 13:39 ` [PATCH v2 " ville.syrjala
2015-09-28 12:18 ` Mika Kahola
2015-09-28 13:27 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1443082216.3303.15.camel@sorvi \
--to=mika.kahola@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=ville.syrjala@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.