On Mon, 07 Dec 2015 09:44:45 +0100,
Daniel Vetter wrote:
>
> On Fri, Dec 04, 2015 at 06:12:47PM +0100, Takashi Iwai wrote:
> > This patch adds a reverse mapping from a digital port number to
> > intel_encoder object containing the corresponding intel_digital_port.
> > It simplifies the query of the encoder a lot.
> >
> > Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
> > ---
> > v2->v3:
> > * Squashed previously two cleanup patches to a single patch
> >
> > drivers/gpu/drm/i915/i915_drv.h | 2 ++
> > drivers/gpu/drm/i915/intel_audio.c | 39 +++++++++++---------------------------
> > drivers/gpu/drm/i915/intel_ddi.c | 1 +
> > drivers/gpu/drm/i915/intel_dp.c | 1 +
> > drivers/gpu/drm/i915/intel_hdmi.c | 2 ++
> > 5 files changed, 17 insertions(+), 28 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> > index 15c6dc0b4f37..9dbc143cac27 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.h
> > +++ b/drivers/gpu/drm/i915/i915_drv.h
> > @@ -1944,6 +1944,8 @@ struct drm_i915_private {
> > /* perform PHY state sanity checks? */
> > bool chv_phy_assert[2];
> >
> > + struct intel_encoder *dig_port_map[I915_MAX_PORTS];
> > +
> > /*
> > * NOTE: This is the dri1/ums dungeon, don't add stuff here. Your patch
> > * will be rejected. Instead look for a better place.
> > diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
> > index eeac9f763110..05f08b445dd6 100644
> > --- a/drivers/gpu/drm/i915/intel_audio.c
> > +++ b/drivers/gpu/drm/i915/intel_audio.c
> > @@ -636,13 +636,11 @@ static int i915_audio_component_sync_audio_rate(struct device *dev,
> > int port, int rate)
> > {
> > struct drm_i915_private *dev_priv = dev_to_i915(dev);
> > - struct drm_device *drm_dev = dev_priv->dev;
> > struct intel_encoder *intel_encoder;
> > - struct intel_digital_port *intel_dig_port;
> > struct intel_crtc *crtc;
> > struct drm_display_mode *mode;
> > struct i915_audio_component *acomp = dev_priv->audio_component;
> > - enum pipe pipe = -1;
> > + enum pipe pipe = INVALID_PIPE;
> > u32 tmp;
> > int n;
> >
> > @@ -655,21 +653,12 @@ static int i915_audio_component_sync_audio_rate(struct device *dev,
> >
> > mutex_lock(&dev_priv->av_mutex);
> > /* 1. get the pipe */
> > - for_each_intel_encoder(drm_dev, intel_encoder) {
> > - if (intel_encoder->type != INTEL_OUTPUT_HDMI)
> > - continue;
> > - intel_dig_port = enc_to_dig_port(&intel_encoder->base);
> > - if (port == intel_dig_port->port) {
> > - crtc = to_intel_crtc(intel_encoder->base.crtc);
> > - if (!crtc) {
> > - DRM_DEBUG_KMS("%s: crtc is NULL\n", __func__);
> > - continue;
> > - }
> > - pipe = crtc->pipe;
> > - break;
> > - }
> > + intel_encoder = dev_priv->dig_port_map[port];
> > + if (intel_encoder && intel_encoder->type == INTEL_OUTPUT_HDMI &&
>
> Is it really legit to call these functions with a port for which we don't
> have an encoder? WARN_ON(!encoder) here and in the other places?
Currently there are little checks in the caller side. So I guess only
a few of them deserve WARN_ON(). The empty encoder and empty crtc
would be good with WARN_ON(), as the port is supposed to be real.
The HDMI check may be silent as is.
> Or would
> that require some function for snd-hda to inquire i915 which ports are
> enabled (which we probably should have to avoid registering audio ports
> that aren't there)?
>
> Otherwise lgtm.
OK, I'll add WARN_ON() to them.
thanks,
Takashi
> -Daniel
>
> > + intel_encoder->base.crtc) {
> > + crtc = to_intel_crtc(intel_encoder->base.crtc);
> > + pipe = crtc->pipe;
> > }
> > -
> > if (pipe == INVALID_PIPE) {
> > DRM_DEBUG_KMS("no pipe for the port %c\n", port_name(port));
> > mutex_unlock(&dev_priv->av_mutex);
> > @@ -716,27 +705,21 @@ static int i915_audio_component_get_eld(struct device *dev, int port,
> > unsigned char *buf, int max_bytes)
> > {
> > struct drm_i915_private *dev_priv = dev_to_i915(dev);
> > - struct drm_device *drm_dev = dev_priv->dev;
> > struct intel_encoder *intel_encoder;
> > struct intel_digital_port *intel_dig_port;
> > const u8 *eld;
> > int ret = -EINVAL;
> >
> > mutex_lock(&dev_priv->av_mutex);
> > - for_each_intel_encoder(drm_dev, intel_encoder) {
> > - if (intel_encoder->type != INTEL_OUTPUT_DISPLAYPORT &&
> > - intel_encoder->type != INTEL_OUTPUT_HDMI)
> > - continue;
> > + intel_encoder = dev_priv->dig_port_map[port];
> > + if (intel_encoder) {
> > + ret = 0;
> > intel_dig_port = enc_to_dig_port(&intel_encoder->base);
> > - if (port == intel_dig_port->port) {
> > - ret = 0;
> > - *enabled = intel_dig_port->audio_connector != NULL;
> > - if (!*enabled)
> > - break;
> > + *enabled = intel_dig_port->audio_connector != NULL;
> > + if (*enabled) {
> > eld = intel_dig_port->audio_connector->eld;
> > ret = drm_eld_size(eld);
> > memcpy(buf, eld, min(max_bytes, ret));
> > - break;
> > }
> > }
> >
> > diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> > index 76ce7c2960b6..59deb0d85533 100644
> > --- a/drivers/gpu/drm/i915/intel_ddi.c
> > +++ b/drivers/gpu/drm/i915/intel_ddi.c
> > @@ -3295,6 +3295,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
> > intel_encoder->get_config = intel_ddi_get_config;
> >
> > intel_dig_port->port = port;
> > + dev_priv->dig_port_map[port] = intel_encoder;
> > intel_dig_port->saved_port_bits = I915_READ(DDI_BUF_CTL(port)) &
> > (DDI_BUF_PORT_REVERSAL |
> > DDI_A_4_LANES);
> > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> > index bec443a629da..146f5da3acb1 100644
> > --- a/drivers/gpu/drm/i915/intel_dp.c
> > +++ b/drivers/gpu/drm/i915/intel_dp.c
> > @@ -6002,6 +6002,7 @@ intel_dp_init(struct drm_device *dev,
> > }
> >
> > intel_dig_port->port = port;
> > + dev_priv->dig_port_map[port] = intel_encoder;
> > intel_dig_port->dp.output_reg = output_reg;
> >
> > intel_encoder->type = INTEL_OUTPUT_DISPLAYPORT;
> > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> > index bdd462e7c690..c046017be786 100644
> > --- a/drivers/gpu/drm/i915/intel_hdmi.c
> > +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> > @@ -2148,6 +2148,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
> > void intel_hdmi_init(struct drm_device *dev,
> > i915_reg_t hdmi_reg, enum port port)
> > {
> > + struct drm_i915_private *dev_priv = dev->dev_private;
> > struct intel_digital_port *intel_dig_port;
> > struct intel_encoder *intel_encoder;
> > struct intel_connector *intel_connector;
> > @@ -2216,6 +2217,7 @@ void intel_hdmi_init(struct drm_device *dev,
> > intel_encoder->cloneable |= 1 << INTEL_OUTPUT_HDMI;
> >
> > intel_dig_port->port = port;
> > + dev_priv->dig_port_map[port] = intel_encoder;
> > intel_dig_port->hdmi.hdmi_reg = hdmi_reg;
> > intel_dig_port->dp.output_reg = INVALID_MMIO_REG;
> >
> > --
> > 2.6.3
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
