On Mon, 2016-09-12 at 18:00 -0700, Dhinakaran Pandiyan wrote:
> Storing the port enum in intel_encoder makes it convenient to know the
> port attached to an encoder. Moving the port information up from
> intel_digital_port to intel_encoder avoids unecessary intel_digital_port
> access and handles MST encoders cleanly without requiring conditional
> checks for them (thanks danvet).
>
> v2:
> Renamed the port enum member from 'attached_port' to 'port' (danvet)
> Fixed missing initialization of port in intel_sdvo.c (danvet)
>
> v3:
> Fixed missing initialization of port in intel_crt.c (Ville)
>
> Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandi...@intel.com>
> Cc: Daniel Vetter <daniel.vet...@ffwll.ch>
> Cc: Ville Syrjälä <ville.syrj...@linux.intel.com>
> Acked-by: Daniel Vetter <daniel.vet...@ffwll.ch>
> Reviewed-by: Lyude <cp...@redhat.com>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 1 +
> drivers/gpu/drm/i915/intel_crt.c | 1 +
> drivers/gpu/drm/i915/intel_ddi.c | 1 +
> drivers/gpu/drm/i915/intel_dp.c | 1 +
> drivers/gpu/drm/i915/intel_dp_mst.c | 1 +
> drivers/gpu/drm/i915/intel_drv.h | 1 +
> drivers/gpu/drm/i915/intel_dsi.c | 1 +
> drivers/gpu/drm/i915/intel_dvo.c | 2 ++
> drivers/gpu/drm/i915/intel_hdmi.c | 1 +
> drivers/gpu/drm/i915/intel_lvds.c | 3 ++-
> drivers/gpu/drm/i915/intel_sdvo.c | 1 +
> drivers/gpu/drm/i915/intel_tv.c | 2 ++
> 12 files changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 1e2dda8..3a2c9e7 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -185,6 +185,7 @@ enum plane {
> #define sprite_name(p, s) ((p) * INTEL_INFO(dev)->num_sprites[(p)] + (s) +
> 'A')
>
> enum port {
> + PORT_NONE = -1,
> PORT_A = 0,
> PORT_B,
> PORT_C,
> diff --git a/drivers/gpu/drm/i915/intel_crt.c
> b/drivers/gpu/drm/i915/intel_crt.c
> index dfbcf16..76ff1ff 100644
> --- a/drivers/gpu/drm/i915/intel_crt.c
> +++ b/drivers/gpu/drm/i915/intel_crt.c
> @@ -892,6 +892,7 @@ void intel_crt_init(struct drm_device *dev)
> intel_connector_attach_encoder(intel_connector, &crt->base);
>
> crt->base.type = INTEL_OUTPUT_ANALOG;
> + crt->base.port = PORT_NONE;
Or is this actually PORT_E for any analog encoder ?
> crt->base.cloneable = (1 << INTEL_OUTPUT_DVO) | (1 <<
> INTEL_OUTPUT_HDMI);
> if (IS_I830(dev))
> crt->base.crtc_mask = (1 << 0);
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c
> b/drivers/gpu/drm/i915/intel_ddi.c
> index 8280548..672f71c 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -2523,6 +2523,7 @@ void intel_ddi_init(struct drm_device *dev, enum port
> port)
> intel_dig_port->max_lanes = max_lanes;
>
> intel_encoder->type = INTEL_OUTPUT_UNKNOWN;
> + intel_encoder->port = port;
> intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);
> intel_encoder->cloneable = 0;
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 75ac62f..e0dda78 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -5752,6 +5752,7 @@ bool intel_dp_init(struct drm_device *dev,
> intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);
> }
> intel_encoder->cloneable = 0;
> + intel_encoder->port = port;
>
> intel_dig_port->hpd_pulse = intel_dp_hpd_pulse;
> dev_priv->hotplug.irq_port[port] = intel_dig_port;
> diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c
> b/drivers/gpu/drm/i915/intel_dp_mst.c
> index 54a9d76..3ffbd69 100644
> --- a/drivers/gpu/drm/i915/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
> @@ -523,6 +523,7 @@ intel_dp_create_fake_mst_encoder(struct
> intel_digital_port *intel_dig_port, enum
> DRM_MODE_ENCODER_DPMST, "DP-MST %c", pipe_name(pipe));
>
> intel_encoder->type = INTEL_OUTPUT_DP_MST;
> + intel_encoder->port = intel_dig_port->port;
> intel_encoder->crtc_mask = 0x7;
> intel_encoder->cloneable = 0;
>
> diff --git a/drivers/gpu/drm/i915/intel_drv.h
> b/drivers/gpu/drm/i915/intel_drv.h
> index abe7a4d..a26f08b 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -202,6 +202,7 @@ struct intel_encoder {
> struct drm_encoder base;
>
> enum intel_output_type type;
> + enum port port;
> unsigned int cloneable;
> void (*hot_plug)(struct intel_encoder *);
> bool (*compute_config)(struct intel_encoder *,
> diff --git a/drivers/gpu/drm/i915/intel_dsi.c
> b/drivers/gpu/drm/i915/intel_dsi.c
> index b2e3d3a..727adaa 100644
> --- a/drivers/gpu/drm/i915/intel_dsi.c
> +++ b/drivers/gpu/drm/i915/intel_dsi.c
> @@ -1488,6 +1488,7 @@ void intel_dsi_init(struct drm_device *dev)
>
> intel_connector->get_hw_state = intel_connector_get_hw_state;
>
> + intel_encoder->port = port;
> /*
> * On BYT/CHV, pipe A maps to MIPI DSI port A, pipe B maps to MIPI DSI
> * port C. BXT isn't limited like this.
> diff --git a/drivers/gpu/drm/i915/intel_dvo.c
> b/drivers/gpu/drm/i915/intel_dvo.c
> index 2e452c5..0cee863 100644
> --- a/drivers/gpu/drm/i915/intel_dvo.c
> +++ b/drivers/gpu/drm/i915/intel_dvo.c
> @@ -516,7 +516,9 @@ void intel_dvo_init(struct drm_device *dev)
> "DVO %c", intel_dvo_port_name(dvo->dvo_reg));
>
> intel_encoder->type = INTEL_OUTPUT_DVO;
> + intel_encoder->port = PORT_NONE;
> intel_encoder->crtc_mask = (1 << 0) | (1 << 1);
> +
> switch (dvo->type) {
> case INTEL_DVO_CHIP_TMDS:
> intel_encoder->cloneable = (1 << INTEL_OUTPUT_ANALOG) |
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c
> b/drivers/gpu/drm/i915/intel_hdmi.c
> index c51073f..8d49800 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -1972,6 +1972,7 @@ void intel_hdmi_init(struct drm_device *dev,
> }
>
> intel_encoder->type = INTEL_OUTPUT_HDMI;
> + intel_encoder->port = port;
> if (IS_CHERRYVIEW(dev)) {
> if (port == PORT_D)
> intel_encoder->crtc_mask = 1 << 2;
> diff --git a/drivers/gpu/drm/i915/intel_lvds.c
> b/drivers/gpu/drm/i915/intel_lvds.c
> index e1d47d5..2e943bd 100644
> --- a/drivers/gpu/drm/i915/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/intel_lvds.c
> @@ -1064,8 +1064,9 @@ void intel_lvds_init(struct drm_device *dev)
> intel_connector->get_hw_state = intel_connector_get_hw_state;
>
> intel_connector_attach_encoder(intel_connector, intel_encoder);
> - intel_encoder->type = INTEL_OUTPUT_LVDS;
>
> + intel_encoder->type = INTEL_OUTPUT_LVDS;
> + intel_encoder->port = PORT_NONE;
> intel_encoder->cloneable = 0;
> if (HAS_PCH_SPLIT(dev))
> intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);
> diff --git a/drivers/gpu/drm/i915/intel_sdvo.c
> b/drivers/gpu/drm/i915/intel_sdvo.c
> index c551024..a061b00 100644
> --- a/drivers/gpu/drm/i915/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> @@ -2981,6 +2981,7 @@ bool intel_sdvo_init(struct drm_device *dev,
> /* encoder type will be decided later */
> intel_encoder = &intel_sdvo->base;
> intel_encoder->type = INTEL_OUTPUT_SDVO;
> + intel_encoder->port = port;
> drm_encoder_init(dev, &intel_encoder->base, &intel_sdvo_enc_funcs, 0,
> "SDVO %c", port_name(port));
>
> diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
> index d960e48..3988c45 100644
> --- a/drivers/gpu/drm/i915/intel_tv.c
> +++ b/drivers/gpu/drm/i915/intel_tv.c
> @@ -1610,7 +1610,9 @@ intel_tv_init(struct drm_device *dev)
> intel_connector->get_hw_state = intel_connector_get_hw_state;
>
> intel_connector_attach_encoder(intel_connector, intel_encoder);
> +
> intel_encoder->type = INTEL_OUTPUT_TVOUT;
> + intel_encoder->port = PORT_NONE;
> intel_encoder->crtc_mask = (1 << 0) | (1 << 1);
> intel_encoder->cloneable = 0;
> intel_encoder->base.possible_crtcs = ((1 << 0) | (1 << 1));
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
