From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH v2 03/20] drm/edid: rename HDMI Forum VSDB to SCDS
Date: Thu, 5 May 2022 00:45:38 +0300 [thread overview]
Message-ID: <YnL0AgIM6B9vw/O4@intel.com> (raw)
In-Reply-To: <f8230e1893400e9a9c5829041a8ab36349182a54.1651569697.git.jani.nikula@intel.com>
On Tue, May 03, 2022 at 12:23:48PM +0300, Jani Nikula wrote:
> The HDMI spec talks about SCDS, Sink Capability Data Structure, exposed
> via HF-VSDB or HF-SCDB. Rename VSDB to SCDS.
>
> Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/drm_edid.c | 41 +++++++++++++++++++-------------------
> 1 file changed, 21 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index fe527a0c50bc..18d05cbb2124 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -5132,17 +5132,18 @@ static void drm_parse_ycbcr420_deep_color_info(struct drm_connector *connector,
> hdmi->y420_dc_modes = dc_mask;
> }
>
> -static void drm_parse_hdmi_forum_vsdb(struct drm_connector *connector,
> - const u8 *hf_vsdb)
> +/* Sink Capability Data Structure */
> +static void drm_parse_hdmi_forum_scds(struct drm_connector *connector,
> + const u8 *hf_scds)
> {
> struct drm_display_info *display = &connector->display_info;
> struct drm_hdmi_info *hdmi = &display->hdmi;
>
> display->has_hdmi_infoframe = true;
>
> - if (hf_vsdb[6] & 0x80) {
> + if (hf_scds[6] & 0x80) {
> hdmi->scdc.supported = true;
> - if (hf_vsdb[6] & 0x40)
> + if (hf_scds[6] & 0x40)
> hdmi->scdc.read_request = true;
> }
>
> @@ -5155,9 +5156,9 @@ static void drm_parse_hdmi_forum_vsdb(struct drm_connector *connector,
> * Lets check it out.
> */
>
> - if (hf_vsdb[5]) {
> + if (hf_scds[5]) {
> /* max clock is 5000 KHz times block value */
> - u32 max_tmds_clock = hf_vsdb[5] * 5000;
> + u32 max_tmds_clock = hf_scds[5] * 5000;
> struct drm_scdc *scdc = &hdmi->scdc;
>
> if (max_tmds_clock > 340000) {
> @@ -5170,42 +5171,42 @@ static void drm_parse_hdmi_forum_vsdb(struct drm_connector *connector,
> scdc->scrambling.supported = true;
>
> /* Few sinks support scrambling for clocks < 340M */
> - if ((hf_vsdb[6] & 0x8))
> + if ((hf_scds[6] & 0x8))
> scdc->scrambling.low_rates = true;
> }
> }
>
> - if (hf_vsdb[7]) {
> + if (hf_scds[7]) {
> u8 max_frl_rate;
> u8 dsc_max_frl_rate;
> u8 dsc_max_slices;
> struct drm_hdmi_dsc_cap *hdmi_dsc = &hdmi->dsc_cap;
>
> DRM_DEBUG_KMS("hdmi_21 sink detected. parsing edid\n");
> - max_frl_rate = (hf_vsdb[7] & DRM_EDID_MAX_FRL_RATE_MASK) >> 4;
> + max_frl_rate = (hf_scds[7] & DRM_EDID_MAX_FRL_RATE_MASK) >> 4;
> drm_get_max_frl_rate(max_frl_rate, &hdmi->max_lanes,
> &hdmi->max_frl_rate_per_lane);
> - hdmi_dsc->v_1p2 = hf_vsdb[11] & DRM_EDID_DSC_1P2;
> + hdmi_dsc->v_1p2 = hf_scds[11] & DRM_EDID_DSC_1P2;
>
> if (hdmi_dsc->v_1p2) {
> - hdmi_dsc->native_420 = hf_vsdb[11] & DRM_EDID_DSC_NATIVE_420;
> - hdmi_dsc->all_bpp = hf_vsdb[11] & DRM_EDID_DSC_ALL_BPP;
> + hdmi_dsc->native_420 = hf_scds[11] & DRM_EDID_DSC_NATIVE_420;
> + hdmi_dsc->all_bpp = hf_scds[11] & DRM_EDID_DSC_ALL_BPP;
>
> - if (hf_vsdb[11] & DRM_EDID_DSC_16BPC)
> + if (hf_scds[11] & DRM_EDID_DSC_16BPC)
> hdmi_dsc->bpc_supported = 16;
> - else if (hf_vsdb[11] & DRM_EDID_DSC_12BPC)
> + else if (hf_scds[11] & DRM_EDID_DSC_12BPC)
> hdmi_dsc->bpc_supported = 12;
> - else if (hf_vsdb[11] & DRM_EDID_DSC_10BPC)
> + else if (hf_scds[11] & DRM_EDID_DSC_10BPC)
> hdmi_dsc->bpc_supported = 10;
> else
> hdmi_dsc->bpc_supported = 0;
>
> - dsc_max_frl_rate = (hf_vsdb[12] & DRM_EDID_DSC_MAX_FRL_RATE_MASK) >> 4;
> + dsc_max_frl_rate = (hf_scds[12] & DRM_EDID_DSC_MAX_FRL_RATE_MASK) >> 4;
> drm_get_max_frl_rate(dsc_max_frl_rate, &hdmi_dsc->max_lanes,
> &hdmi_dsc->max_frl_rate_per_lane);
> - hdmi_dsc->total_chunk_kbytes = hf_vsdb[13] & DRM_EDID_DSC_TOTAL_CHUNK_KBYTES;
> + hdmi_dsc->total_chunk_kbytes = hf_scds[13] & DRM_EDID_DSC_TOTAL_CHUNK_KBYTES;
>
> - dsc_max_slices = hf_vsdb[12] & DRM_EDID_DSC_MAX_SLICES;
> + dsc_max_slices = hf_scds[12] & DRM_EDID_DSC_MAX_SLICES;
> switch (dsc_max_slices) {
> case 1:
> hdmi_dsc->max_slices = 1;
> @@ -5243,7 +5244,7 @@ static void drm_parse_hdmi_forum_vsdb(struct drm_connector *connector,
> }
> }
>
> - drm_parse_ycbcr420_deep_color_info(connector, hf_vsdb);
> + drm_parse_ycbcr420_deep_color_info(connector, hf_scds);
> }
>
> static void drm_parse_hdmi_deep_color_info(struct drm_connector *connector,
> @@ -5380,7 +5381,7 @@ static void drm_parse_cea_ext(struct drm_connector *connector,
> drm_parse_hdmi_vsdb_video(connector, db);
> if (cea_db_is_hdmi_forum_vsdb(db) ||
> cea_db_is_hdmi_forum_scdb(db))
> - drm_parse_hdmi_forum_vsdb(connector, db);
> + drm_parse_hdmi_forum_scds(connector, db);
> if (cea_db_is_microsoft_vsdb(db))
> drm_parse_microsoft_vsdb(connector, db);
> if (cea_db_is_y420cmdb(db))
> --
> 2.30.2
--
Ville Syrjälä
Intel
next prev parent reply other threads:[~2022-05-04 21:45 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-03 9:23 [Intel-gfx] [PATCH v2 00/20] drm/edid: CEA data block iterators, and more Jani Nikula
2022-05-03 9:23 ` [Intel-gfx] [PATCH v2 01/20] drm/edid: reset display info in drm_add_edid_modes() for NULL edid Jani Nikula
2022-05-03 9:23 ` [Intel-gfx] [PATCH v2 02/20] drm/edid: check for HF-SCDB block Jani Nikula
2022-05-03 9:23 ` [Intel-gfx] [PATCH v2 03/20] drm/edid: rename HDMI Forum VSDB to SCDS Jani Nikula
2022-05-04 21:45 ` Ville Syrjälä [this message]
2022-05-03 9:23 ` [Intel-gfx] [PATCH v2 04/20] drm/edid: clean up CTA data block tag definitions Jani Nikula
2022-05-03 9:23 ` [Intel-gfx] [PATCH v2 05/20] drm/edid: add iterator for EDID base and extension blocks Jani Nikula
2022-05-03 9:23 ` [Intel-gfx] [PATCH v2 06/20] drm/edid: add iterator for CTA data blocks Jani Nikula
2022-05-03 9:23 ` [Intel-gfx] [PATCH v2 07/20] drm/edid: clean up cea_db_is_*() functions Jani Nikula
2022-05-03 9:23 ` [Intel-gfx] [PATCH v2 08/20] drm/edid: convert add_cea_modes() to use cea db iter Jani Nikula
2022-05-03 9:23 ` [Intel-gfx] [PATCH v2 09/20] drm/edid: convert drm_edid_to_speaker_allocation() " Jani Nikula
2022-05-03 9:23 ` [Intel-gfx] [PATCH v2 10/20] drm/edid: convert drm_edid_to_sad() " Jani Nikula
2022-05-03 9:23 ` [Intel-gfx] [PATCH v2 11/20] drm/edid: convert drm_detect_hdmi_monitor() " Jani Nikula
2022-05-03 9:23 ` [Intel-gfx] [PATCH v2 12/20] drm/edid: convert drm_detect_monitor_audio() " Jani Nikula
2022-05-03 9:23 ` [Intel-gfx] [PATCH v2 13/20] drm/edid: convert drm_parse_cea_ext() " Jani Nikula
2022-05-04 22:14 ` Ville Syrjälä
2022-05-03 9:23 ` [Intel-gfx] [PATCH v2 14/20] drm/edid: convert drm_edid_to_eld() " Jani Nikula
2022-05-03 9:24 ` [Intel-gfx] [PATCH v2 15/20] drm/edid: sunset the old unused cea data block iterators Jani Nikula
2022-05-03 9:24 ` [Intel-gfx] [PATCH v2 16/20] drm/edid: restore some type safety to cea_db_*() functions Jani Nikula
2022-05-03 9:24 ` [Intel-gfx] [PATCH v2 17/20] drm/edid: detect basic audio in all CEA extensions Jani Nikula
2022-05-03 9:24 ` [Intel-gfx] [PATCH v2 18/20] drm/edid: detect color formats and CTA revision in all CTA extensions Jani Nikula
2022-05-04 22:11 ` Ville Syrjälä
2022-05-05 10:53 ` Jani Nikula
2022-05-05 10:52 ` [Intel-gfx] [PATCH v3] " Jani Nikula
2022-05-05 14:32 ` Ville Syrjälä
2022-05-03 9:24 ` [Intel-gfx] [PATCH v2 19/20] drm/edid: skip CTA extension scan in drm_edid_to_eld() just for CTA rev Jani Nikula
2022-05-03 9:24 ` [Intel-gfx] [PATCH v2 20/20] drm/edid: sunset drm_find_cea_extension() Jani Nikula
2022-05-03 12:35 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/edid: CEA data block iterators, and more (rev3) Patchwork
2022-05-03 12:59 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-05-04 8:10 ` [Intel-gfx] [PATCH v2 00/20] drm/edid: CEA data block iterators, and more Jani Nikula
2022-05-04 10:49 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/edid: CEA data block iterators, and more (rev3) Patchwork
2022-05-04 22:30 ` [Intel-gfx] [PATCH v2 00/20] drm/edid: CEA data block iterators, and more Ville Syrjälä
2022-05-05 17:40 ` Jani Nikula
2022-05-05 12:23 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/edid: CEA data block iterators, and more (rev4) Patchwork
2022-05-05 12:46 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-05-05 14:54 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YnL0AgIM6B9vw/O4@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox