Re: [PATCH 06/15] drm/i915: Make encoder->compute_config take the connector state

Daniel Vetter
2016-08-18T13:31:15Z

On Tue, Aug 09, 2016 at 05:04:05PM +0200, Maarten Lankhorst wrote:
> Some places iterate over connector_state to find the right
> connector, pass it along as argument.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

> ---
> drivers/gpu/drm/i915/intel_crt.c | 3 ++-
> drivers/gpu/drm/i915/intel_ddi.c | 7 ++++---
> drivers/gpu/drm/i915/intel_display.c | 2 +-
> drivers/gpu/drm/i915/intel_dp.c | 3 ++-
> drivers/gpu/drm/i915/intel_dp_mst.c | 4 ++--
> drivers/gpu/drm/i915/intel_drv.h | 9 ++++++---
> drivers/gpu/drm/i915/intel_dsi.c | 3 ++-
> drivers/gpu/drm/i915/intel_dvo.c | 3 ++-
> drivers/gpu/drm/i915/intel_hdmi.c | 3 ++-
> drivers/gpu/drm/i915/intel_lvds.c | 3 ++-
> drivers/gpu/drm/i915/intel_sdvo.c | 3 ++-
> drivers/gpu/drm/i915/intel_tv.c | 3 ++-
> 12 files changed, 29 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
> index 6e6c4bde105a..8fe36d049d2f 100644
> --- a/drivers/gpu/drm/i915/intel_crt.c
> +++ b/drivers/gpu/drm/i915/intel_crt.c
> @@ -261,7 +261,8 @@ intel_crt_mode_valid(struct drm_connector *connector,
> }
>
> static bool intel_crt_compute_config(struct intel_encoder *encoder,
> - struct intel_crtc_state *pipe_config)
> + struct intel_crtc_state *pipe_config,
> + struct drm_connector_state *conn_state)
> {
> struct drm_device *dev = encoder->base.dev;
>
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index 66feb1eafc93..b23872839fe0 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -2285,7 +2285,8 @@ void intel_ddi_get_config(struct intel_encoder *encoder,
> }
>
> static bool intel_ddi_compute_config(struct intel_encoder *encoder,
> - struct intel_crtc_state *pipe_config)
> + struct intel_crtc_state *pipe_config,
> + struct drm_connector_state *conn_state)
> {
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> int type = encoder->type;
> @@ -2298,9 +2299,9 @@ static bool intel_ddi_compute_config(struct intel_encoder *encoder,
> pipe_config->cpu_transcoder = TRANSCODER_EDP;
>
> if (type == INTEL_OUTPUT_HDMI)
> - ret = intel_hdmi_compute_config(encoder, pipe_config);
> + ret = intel_hdmi_compute_config(encoder, pipe_config, conn_state);
> else
> - ret = intel_dp_compute_config(encoder, pipe_config);
> + ret = intel_dp_compute_config(encoder, pipe_config, conn_state);
>
> if (IS_BROXTON(dev_priv) && ret)
> pipe_config->lane_lat_optim_mask =
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index b536d22aaf59..c30feffc8be4 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -12589,7 +12589,7 @@ encoder_retry:
>
> encoder = to_intel_encoder(connector_state->best_encoder);
>
> - if (!(encoder->compute_config(encoder, pipe_config))) {
> + if (!(encoder->compute_config(encoder, pipe_config, connector_state))) {
> DRM_DEBUG_KMS("Encoder config failure\n");
> goto fail;
> }
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 8bf1ba3166e9..2340c2b87a5d 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1470,7 +1470,8 @@ void intel_dp_compute_rate(struct intel_dp *intel_dp, int port_clock,
>
> bool
> intel_dp_compute_config(struct intel_encoder *encoder,
> - struct intel_crtc_state *pipe_config)
> + struct intel_crtc_state *pipe_config,
> + 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_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
> index 3ec290caef17..694c67ebf82a 100644
> --- a/drivers/gpu/drm/i915/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
> @@ -31,7 +31,8 @@
> #include <drm/drm_edid.h>
>
> static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
> - struct intel_crtc_state *pipe_config)
> + struct intel_crtc_state *pipe_config,
> + 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;
> @@ -54,7 +55,6 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
> */
> lane_count = drm_dp_max_lane_count(intel_dp->dpcd);
>
> -
> pipe_config->lane_count = lane_count;
>
> pipe_config->pipe_bpp = 24;
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 8e0ca11c0e99..9e5b675e8ac5 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -194,7 +194,8 @@ struct intel_encoder {
> unsigned int cloneable;
> void (*hot_plug)(struct intel_encoder *);
> bool (*compute_config)(struct intel_encoder *,
> - struct intel_crtc_state *);
> + struct intel_crtc_state *,
> + struct drm_connector_state *);
> void (*pre_pll_enable)(struct intel_encoder *,
> struct intel_crtc_state *,
> struct drm_connector_state *);
> @@ -1367,7 +1368,8 @@ void intel_dp_encoder_suspend(struct intel_encoder *intel_encoder);
> void intel_dp_encoder_destroy(struct drm_encoder *encoder);
> int intel_dp_sink_crc(struct intel_dp *intel_dp, u8 *crc);
> bool intel_dp_compute_config(struct intel_encoder *encoder,
> - struct intel_crtc_state *pipe_config);
> + struct intel_crtc_state *pipe_config,
> + struct drm_connector_state *conn_state);
> bool intel_dp_is_edp(struct drm_device *dev, enum port port);
> enum irqreturn intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port,
> bool long_hpd);
> @@ -1492,7 +1494,8 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
> struct intel_connector *intel_connector);
> struct intel_hdmi *enc_to_intel_hdmi(struct drm_encoder *encoder);
> bool intel_hdmi_compute_config(struct intel_encoder *encoder,
> - struct intel_crtc_state *pipe_config);
> + struct intel_crtc_state *pipe_config,
> + struct drm_connector_state *conn_state);
> void intel_dp_dual_mode_set_tmds_output(struct intel_hdmi *hdmi, bool enable);
>
>
> diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
> index 107b70c19333..1a2e1dcbff1a 100644
> --- a/drivers/gpu/drm/i915/intel_dsi.c
> +++ b/drivers/gpu/drm/i915/intel_dsi.c
> @@ -312,7 +312,8 @@ static inline bool is_cmd_mode(struct intel_dsi *intel_dsi)
> }
>
> static bool intel_dsi_compute_config(struct intel_encoder *encoder,
> - struct intel_crtc_state *pipe_config)
> + struct intel_crtc_state *pipe_config,
> + struct drm_connector_state *conn_state)
> {
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi,
> diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
> index 52dde9b71ca5..141483fdcf7b 100644
> --- a/drivers/gpu/drm/i915/intel_dvo.c
> +++ b/drivers/gpu/drm/i915/intel_dvo.c
> @@ -239,7 +239,8 @@ intel_dvo_mode_valid(struct drm_connector *connector,
> }
>
> static bool intel_dvo_compute_config(struct intel_encoder *encoder,
> - struct intel_crtc_state *pipe_config)
> + struct intel_crtc_state *pipe_config,
> + struct drm_connector_state *conn_state)
> {
> struct intel_dvo *intel_dvo = enc_to_dvo(encoder);
> const struct drm_display_mode *fixed_mode =
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index 560eff9a3694..1a116a6a1817 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -1301,7 +1301,8 @@ static bool hdmi_12bpc_possible(struct intel_crtc_state *crtc_state)
> }
>
> bool intel_hdmi_compute_config(struct intel_encoder *encoder,
> - struct intel_crtc_state *pipe_config)
> + struct intel_crtc_state *pipe_config,
> + struct drm_connector_state *conn_state)
> {
> struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&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 4cae4a8ea491..bfeec045579e 100644
> --- a/drivers/gpu/drm/i915/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/intel_lvds.c
> @@ -317,7 +317,8 @@ intel_lvds_mode_valid(struct drm_connector *connector,
> }
>
> static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder,
> - struct intel_crtc_state *pipe_config)
> + struct intel_crtc_state *pipe_config,
> + struct drm_connector_state *conn_state)
> {
> struct drm_device *dev = intel_encoder->base.dev;
> struct intel_lvds_encoder *lvds_encoder =
> diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
> index 48f5deb6a4cf..7c08d555f35d 100644
> --- a/drivers/gpu/drm/i915/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> @@ -1125,7 +1125,8 @@ static void i9xx_adjust_sdvo_tv_clock(struct intel_crtc_state *pipe_config)
> }
>
> static bool intel_sdvo_compute_config(struct intel_encoder *encoder,
> - struct intel_crtc_state *pipe_config)
> + struct intel_crtc_state *pipe_config,
> + struct drm_connector_state *conn_state)
> {
> struct intel_sdvo *intel_sdvo = to_sdvo(encoder);
> struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
> diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
> index 440ce7933573..d960e4866595 100644
> --- a/drivers/gpu/drm/i915/intel_tv.c
> +++ b/drivers/gpu/drm/i915/intel_tv.c
> @@ -912,7 +912,8 @@ intel_tv_get_config(struct intel_encoder *encoder,
>
> static bool
> intel_tv_compute_config(struct intel_encoder *encoder,
> - struct intel_crtc_state *pipe_config)
> + struct intel_crtc_state *pipe_config,
> + struct drm_connector_state *conn_state)
> {
> struct intel_tv *intel_tv = enc_to_tv(encoder);
> const struct tv_mode *tv_mode = intel_tv_mode_find(intel_tv);
> --
> 2.7.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

--
Daniel Vetter
Software Engineer, Intel Corporation