On Wed, 2016-08-24 at 08:08 +0200, Daniel Vetter wrote:
> On Tue, Aug 23, 2016 at 01:49:17PM -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).
> >
> > Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@xxxxxxxxx>
> > Cc: Daniel Vetter <daniel.vetter@xxxxxxxx>
> > Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> > ---
> > drivers/gpu/drm/i915/i915_drv.h | 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_tv.c | 2 ++
> > 10 files changed, 13 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> > index 9cd102c..60e282d5 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_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> > index c2df4e4..086de39 100644
> > --- a/drivers/gpu/drm/i915/intel_ddi.c
> > +++ b/drivers/gpu/drm/i915/intel_ddi.c
> > @@ -2426,6 +2426,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->attached_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 364db90..4771428 100644
> > --- a/drivers/gpu/drm/i915/intel_dp.c
> > +++ b/drivers/gpu/drm/i915/intel_dp.c
> > @@ -5726,6 +5726,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->attached_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 629337d..a51f6f7 100644
> > --- a/drivers/gpu/drm/i915/intel_dp_mst.c
> > +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
> > @@ -540,6 +540,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->attached_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 1c700b0..101d671 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 attached_port;
>
> Why the attached_ prefix? The intel_encoder _is_ the port (more or less at
> least). Also intel_sdvo.c is missing. Otherwise I think it makes sense.
> -Daniel
>
>
I didn't realize that, will change.
> > 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 de8e9fb..293e530 100644
> > --- a/drivers/gpu/drm/i915/intel_dsi.c
> > +++ b/drivers/gpu/drm/i915/intel_dsi.c
> > @@ -1478,6 +1478,7 @@ void intel_dsi_init(struct drm_device *dev)
> >
> > intel_connector->get_hw_state = intel_connector_get_hw_state;
> >
> > + intel_encoder->attached_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 47bdf9d..86a888f 100644
> > --- a/drivers/gpu/drm/i915/intel_dvo.c
> > +++ b/drivers/gpu/drm/i915/intel_dvo.c
> > @@ -511,7 +511,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->attached_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 4df9f38..070a5e2 100644
> > --- a/drivers/gpu/drm/i915/intel_hdmi.c
> > +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> > @@ -1962,6 +1962,7 @@ void intel_hdmi_init(struct drm_device *dev,
> > }
> >
> > intel_encoder->type = INTEL_OUTPUT_HDMI;
> > + intel_encoder->attached_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 668eabb..a497698 100644
> > --- a/drivers/gpu/drm/i915/intel_lvds.c
> > +++ b/drivers/gpu/drm/i915/intel_lvds.c
> > @@ -1052,8 +1052,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->attached_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_tv.c b/drivers/gpu/drm/i915/intel_tv.c
> > index 49136ad..18c4257 100644
> > --- a/drivers/gpu/drm/i915/intel_tv.c
> > +++ b/drivers/gpu/drm/i915/intel_tv.c
> > @@ -1603,7 +1603,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->attached_port = PORT_NONE;
> > intel_encoder->crtc_mask = (1 << 0) | (1 << 1);
> > intel_encoder->cloneable = 0;
> > intel_encoder->base.possible_crtcs = ((1 << 0) | (1 << 1));
> > --
> > 2.5.0
> >
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
