On Fri, Aug 14, 2015 at 12:30:44PM +0300, Jyri Sarha wrote:
> +static int tda998x_write_aif(struct tda998x_priv *priv,
> +                          struct hdmi_audio_infoframe *cea)
> +{
> +     uint8_t buf[HDMI_INFOFRAME_SIZE(AUDIO)];
> +     int len;
> +
> +     len = hdmi_audio_infoframe_pack(cea, buf, sizeof(buf));
> +     if (len < 0) {
> +             dev_err(&priv->hdmi->dev,
> +                     "Failed to pack audio infoframe: %d\n", len);
> +             return len;
> +     }
> +
> +     /* Write the audio information packet */
> +     tda998x_write_if(priv, DIP_IF_FLAGS_IF4, REG_IF4_HB0, buf, len);
> +     return 0;
> +}
> +

I have such a function already queued up, but I can't push it out at the
moment because of too many conflicts across all my DRM work.  I'm waiting
for after 4.3-rc1 before publishing anything from or accepting anything
else into DRM branches.

>  static void
>  tda998x_write_avi(struct tda998x_priv *priv, struct drm_display_mode *mode)
>  {
> @@ -670,19 +691,24 @@ static void tda998x_audio_mute(struct tda998x_priv 
> *priv, bool on)
>       }
>  }
>  
> -static void
> +static int
>  tda998x_configure_audio(struct tda998x_priv *priv,
> -             struct drm_display_mode *mode, struct tda998x_encoder_params *p)
> +                     int mode_clock,
> +                     int ena_ap,
> +                     int dai_format,
> +                     int sample_width,
> +                     int sample_rate,
> +                     const u8 *status)

I don't think this is an improvement.

> +static int tda998x_audio_get_eld(struct device *dev, uint8_t *buf, size_t 
> len)
> +{
> +     struct tda998x_priv *priv = dev_get_drvdata(dev);
> +     struct drm_mode_config *config = &priv->encoder->dev->mode_config;
> +     struct drm_connector *connector;
> +     int ret = -ENODEV;
> +
> +     mutex_lock(&config.mutex);
> +     list_for_each_entry(connector, &config->connector_list, head) {
> +             if (priv->encoder == connector->encoder) {
> +                     memcpy(buf, connector->eld, 
> +                            min(sizeof(connector->eld), len));
> +                     ret = 0;
> +             }
> +     }
> +     mutex_unlock(&config.mutex);

Obviously untested.  Should be config->mutex.

But in any case, when I kill the DRM slave encoder code in here, this
becomes unnecessary.

-- 
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.

Reply via email to