On Wed, Jan 04, 2023 at 12:05:18PM +0200, Jani Nikula wrote:
> A number of places need access to the VICs. Just parse them early for
> easy access. Gracefully handle multiple CTA VDBs. It's unlikely to have
> more than one, but the CTA-861 references "Video Data Block(s)", so err
> on the safe side.
>
> Start parsing them now, convert users in follow-up to have fewer moving
> parts in one go.
>
> Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/drm_connector.c | 1 +
> drivers/gpu/drm/drm_edid.c | 36 +++++++++++++++++++++++++++++++++
> include/drm/drm_connector.h | 10 +++++++++
> 3 files changed, 47 insertions(+)
>
> diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
> index 8d92777e57dd..21b3df75ab8c 100644
> --- a/drivers/gpu/drm/drm_connector.c
> +++ b/drivers/gpu/drm/drm_connector.c
> @@ -565,6 +565,7 @@ void drm_connector_cleanup(struct drm_connector *connector)
> ida_free(&dev->mode_config.connector_ida, connector->index);
>
> kfree(connector->display_info.bus_formats);
> + kfree(connector->display_info.vics);
> drm_mode_object_unregister(dev, &connector->base);
> kfree(connector->name);
> connector->name = NULL;
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index b94adb9bbefb..90846dc69061 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -5862,6 +5862,36 @@ drm_default_rgb_quant_range(const struct drm_display_mode *mode)
> }
> EXPORT_SYMBOL(drm_default_rgb_quant_range);
>
> +/* CTA-861 Video Data Block (CTA VDB) */
> +static void parse_cta_vdb(struct drm_connector *connector, const struct cea_db *db)
> +{
> + struct drm_display_info *info = &connector->display_info;
> + int i, vic_index, len = cea_db_payload_len(db);
> + const u8 *svds = cea_db_data(db);
> + u8 *vics;
> +
> + if (!len)
> + return;
> +
> + /* Gracefully handle multiple VDBs, however unlikely that is */
> + vics = krealloc(info->vics, info->vics_len + len, GFP_KERNEL);
> + if (!vics)
> + return;
> +
> + vic_index = info->vics_len;
> + info->vics_len += len;
> + info->vics = vics;
> +
> + for (i = 0; i < len; i++) {
> + u8 vic = svd_to_vic(svds[i]);
> +
> + if (!drm_valid_cea_vic(vic))
> + vic = 0;
> +
> + info->vics[vic_index++] = vic;
> + }
> +}
> +
> static void drm_parse_vcdb(struct drm_connector *connector, const u8 *db)
> {
> struct drm_display_info *info = &connector->display_info;
> @@ -6205,6 +6235,8 @@ static void drm_parse_cea_ext(struct drm_connector *connector,
> drm_parse_vcdb(connector, data);
> else if (cea_db_is_hdmi_hdr_metadata_block(db))
> drm_parse_hdr_metadata_block(connector, data);
> + else if (cea_db_tag(db) == CTA_DB_VIDEO)
> + parse_cta_vdb(connector, db);
> }
> cea_db_iter_end(&iter);
> }
> @@ -6372,6 +6404,10 @@ static void drm_reset_display_info(struct drm_connector *connector)
> info->mso_stream_count = 0;
> info->mso_pixel_overlap = 0;
> info->max_dsc_bpp = 0;
> +
> + kfree(info->vics);
> + info->vics = NULL;
> + info->vics_len = 0;
> }
>
> static u32 update_display_info(struct drm_connector *connector,
> diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
> index 9037f1317aee..d97ed06d5837 100644
> --- a/include/drm/drm_connector.h
> +++ b/include/drm/drm_connector.h
> @@ -721,6 +721,16 @@ struct drm_display_info {
> * monitor's default value is used instead.
> */
> u32 max_dsc_bpp;
> +
> + /**
> + * @vics: Array of vics_len VICs. Internal to EDID parsing.
> + */
> + u8 *vics;
> +
> + /**
> + * @vics_len: Number of elements in vics. Internal to EDID parsing.
> + */
> + int vics_len;
> };
>
> int drm_display_info_set_bus_formats(struct drm_display_info *info,
> --
> 2.34.1
--
Ville Syrjälä
Intel
