drm/edid: rename macro for CEA extended-tag
Subsystems (2)
PATCH v3 1/1 drm/edid: rename macro for CEA extended-tag
CEA-861-F introduces extended tag codes for EDID extension blocks, which indicates the actual type of the data block. The code for using exteded tag is 0x7, whereas in the existing code, the corresponding macro is named as "VIDEO_CAPABILITY_BLOCK"
This patch renames the macro and usages from "VIDEO_CAPABILITY_BLOCK" to "CEA_EXTENDED_TAG"
V2: Add extended tag code check for video capabilitiy block (ville)
V3: Ville:
- Use suggested names for macros
- Check the block length first, before checking the extended tag
--- drivers/gpu/drm/drm_edid.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_edid.c +12 -3
@@ -2566,7 +2566,8 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid,#define VIDEO_BLOCK 0x02#define VENDOR_BLOCK 0x03#define SPEAKER_BLOCK 0x04 -#define VIDEO_CAPABILITY_BLOCK 0x07 +#define USE_EXTENDED_TAG 0x07 +#define EXT_VIDEO_CAPABILITY_BLOCK 0x00#define EDID_BASIC_AUDIO (1 << 6)#define EDID_CEA_YCRCB444 (1 << 5)#define EDID_CEA_YCRCB422 (1 << 4)
@@ -3218,6 +3219,12 @@ cea_db_payload_len(const u8 *db) }static int +cea_db_extended_tag (const u8 *db) +{ +return db[1 ]; +} + +static int cea_db_tag (const u8 *db) {return db[0 ] >>5 ;
@@ -3793,8 +3800,10 @@ bool drm_rgb_quant_range_selectable(struct edid *edid)return false;for_each_cea_db (edid_ext, i, start, end) { -if (cea_db_tag (&edid_ext[i]) ==VIDEO_CAPABILITY_BLOCK && -cea_db_payload_len (&edid_ext[i]) ==2 ) { +if (cea_db_tag (&edid_ext[i]) ==USE_EXTENDED_TAG && +cea_db_payload_len (&edid_ext[i]) ==2 && +cea_db_extended_tag (&edid_ext[i]) == +EXT_VIDEO_CAPABILITY_BLOCK ) {DRM_DEBUG_KMS ("CEA VCDB 0x%02x\n" , edid_ext[i +2 ]);return edid_ext[i +2 ] &EDID_CEA_VCDB_QS ; }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for drm/edid: rename macro for CEA extended-tag (rev5)
== Series Details ==
== Series Details ==
Series: drm/edid: rename macro for CEA extended-tag (rev5)
URL : https://patchwork.freedesktop.org/series/26744/
State : warning
== Summary ==
Series 26744v5 drm/edid: rename macro for CEA extended-tag
https://patchwork.freedesktop.org/api/1.0/series/26744/revisions/5/mbox/
Test gem_ringfill:
Subgroup basic-default-forked:
pass -> SKIP (fi-bsw-n3050)
Test kms_pipe_crc_basic:
Subgroup hang-read-crc-pipe-a:
pass -> DMESG-WARN (fi-pnv-d510) fdo#101597fdo#101597 https://bugs.freedesktop.org/show_bug.cgi?id=101597
fi-bdw-5557u total:279 pass:264 dwarn:0 dfail:0 fail:3 skip:11 time:440s fi-bdw-gvtdvm total:279 pass:257 dwarn:8 dfail:0 fail:0 skip:14 time:431s fi-blb-e6850 total:279 pass:224 dwarn:1 dfail:0 fail:0 skip:54 time:359s fi-bsw-n3050 total:279 pass:238 dwarn:0 dfail:0 fail:3 skip:37 time:520s fi-bxt-j4205 total:279 pass:256 dwarn:0 dfail:0 fail:3 skip:19 time:501s fi-byt-j1900 total:279 pass:250 dwarn:1 dfail:0 fail:3 skip:24 time:480s fi-byt-n2820 total:279 pass:246 dwarn:1 dfail:0 fail:3 skip:28 time:478s fi-glk-2a total:279 pass:256 dwarn:0 dfail:0 fail:3 skip:19 time:586s fi-hsw-4770 total:279 pass:259 dwarn:0 dfail:0 fail:3 skip:16 time:429s fi-hsw-4770r total:279 pass:259 dwarn:0 dfail:0 fail:3 skip:16 time:413s fi-ilk-650 total:279 pass:225 dwarn:0 dfail:0 fail:3 skip:50 time:412s fi-ivb-3520m total:279 pass:257 dwarn:0 dfail:0 fail:3 skip:18 time:488s fi-ivb-3770 total:279 pass:257 dwarn:0 dfail:0 fail:3 skip:18 time:472s fi-kbl-7500u total:279 pass:257 dwarn:0 dfail:0 fail:3 skip:18 time:456s fi-kbl-7560u total:279 pass:264 dwarn:1 dfail:0 fail:3 skip:10 time:565s fi-kbl-r total:279 pass:256 dwarn:1 dfail:0 fail:3 skip:18 time:563s fi-pnv-d510 total:279 pass:222 dwarn:2 dfail:0 fail:0 skip:55 time:557s fi-skl-6260u total:279 pass:265 dwarn:0 dfail:0 fail:3 skip:10 time:456s fi-skl-6700hq total:279 pass:219 dwarn:1 dfail:0 fail:33 skip:24 time:302s fi-skl-6700k total:279 pass:257 dwarn:0 dfail:0 fail:3 skip:18 time:461s fi-skl-6770hq total:279 pass:265 dwarn:0 dfail:0 fail:3 skip:10 time:468s fi-skl-gvtdvm total:279 pass:266 dwarn:0 dfail:0 fail:0 skip:13 time:433s fi-snb-2520m total:279 pass:247 dwarn:0 dfail:0 fail:3 skip:28 time:539s fi-snb-2600 total:279 pass:246 dwarn:0 dfail:0 fail:3 skip:29 time:404s
df0182c2c95385492772c6e4ace76b463298b8ca drm-tip: 2017y-07m-03d-13h-20m-24s UTC integration manifest d79de52 drm/edid: rename macro for CEA extended-tag
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_5097/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Shashank Sharma
CEA-861-F introduces extended tag codes for EDID extension blocks, which indicates the actual type of the data block. The code for using exteded tag is
0x7, whereas in the existing code, the corresponding macro is named as "VIDEO_CAPABILITY_BLOCK"This patch renames the macro and usages from "
VIDEO_CAPABILITY_BLOCK" to "CEA_EXTENDED_TAG"
Hmmm, no it doesn't. It renames it to "USE_EXTENDED_TAG".
Quoted 58 lines
V2: Add extended tag code check for video capabilitiy block (ville)
V3: Ville:
- Use suggested names for macros
- Check the block length first, before checking the extended tagCc Ville Syrjala <[email protected]>Signed-off-by Shashank Sharma <[email protected]>--- drivers/gpu/drm/drm_edid.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)drivers/gpu/drm/drm_edid.c +12
-3@@ -2566,7 +2566,8 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid,#define VIDEO_BLOCK 0x02#define VENDOR_BLOCK 0x03#define SPEAKER_BLOCK 0x04 -#define VIDEO_CAPABILITY_BLOCK 0x07 +#define USE_EXTENDED_TAG 0x07 +#define EXT_VIDEO_CAPABILITY_BLOCK 0x00#define EDID_BASIC_AUDIO (1 << 6)#define EDID_CEA_YCRCB444 (1 << 5)#define EDID_CEA_YCRCB422 (1 << 4)@@ -3218,6 +3219,12 @@ cea_db_payload_len(const u8 *db) }static int +cea_db_extended_tag (const u8 *db) +{ +return db[1 ]; +} + +static int cea_db_tag (const u8 *db) {return db[0 ] >>5 ;@@ -3793,8 +3800,10 @@ bool drm_rgb_quant_range_selectable(struct edid *edid)return false;for_each_cea_db (edid_ext, i, start, end) { -if (cea_db_tag (&edid_ext[i]) ==VIDEO_CAPABILITY_BLOCK && -cea_db_payload_len (&edid_ext[i]) ==2 ) { +if (cea_db_tag (&edid_ext[i]) ==USE_EXTENDED_TAG && +cea_db_payload_len (&edid_ext[i]) ==2 && +cea_db_extended_tag (&edid_ext[i]) == +EXT_VIDEO_CAPABILITY_BLOCK ) {DRM_DEBUG_KMS ("CEA VCDB 0x%02x\n" , edid_ext[i +2 ]);return edid_ext[i +2 ] &EDID_CEA_VCDB_QS ; }Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Regards
Shashank
Quoted 9 lines · David Weinehall
Quoted 7 lines · Shashank Sharma
CEA-861-F introduces extended tag codes for EDID extension blocks, which indicates the actual type of the data block. The code for using exteded tag is
0x7, whereas in the existing code, the corresponding macro is named as "VIDEO_CAPABILITY_BLOCK"This patch renames the macro and usages from "
VIDEO_CAPABILITY_BLOCK" to "CEA_EXTENDED_TAG"Hmmm, no it doesn't. It renames it to "
USE_EXTENDED_TAG".
Well, true :-), will cover this up.
- Shashank
Quoted 54 lines
Quoted 54 lines
V2: Add extended tag code check for video capabilitiy block (ville)
V3: Ville:
- Use suggested names for macros
- Check the block length first, before checking the extended tagCc Ville Syrjala <[email protected]>Signed-off-by Shashank Sharma <[email protected]>--- drivers/gpu/drm/drm_edid.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)drivers/gpu/drm/drm_edid.c +12
-3@@ -2566,7 +2566,8 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid,#define VIDEO_BLOCK 0x02#define VENDOR_BLOCK 0x03#define SPEAKER_BLOCK 0x04 -#define VIDEO_CAPABILITY_BLOCK 0x07 +#define USE_EXTENDED_TAG 0x07 +#define EXT_VIDEO_CAPABILITY_BLOCK 0x00#define EDID_BASIC_AUDIO (1 << 6)#define EDID_CEA_YCRCB444 (1 << 5)#define EDID_CEA_YCRCB422 (1 << 4)@@ -3218,6 +3219,12 @@ cea_db_payload_len(const u8 *db) }static int +cea_db_extended_tag (const u8 *db) +{ +return db[1 ]; +} + +static int cea_db_tag (const u8 *db) {return db[0 ] >>5 ;@@ -3793,8 +3800,10 @@ bool drm_rgb_quant_range_selectable(struct edid *edid)return false;for_each_cea_db (edid_ext, i, start, end) { -if (cea_db_tag (&edid_ext[i]) ==VIDEO_CAPABILITY_BLOCK && -cea_db_payload_len (&edid_ext[i]) ==2 ) { +if (cea_db_tag (&edid_ext[i]) ==USE_EXTENDED_TAG && +cea_db_payload_len (&edid_ext[i]) ==2 && +cea_db_extended_tag (&edid_ext[i]) == +EXT_VIDEO_CAPABILITY_BLOCK ) {DRM_DEBUG_KMS ("CEA VCDB 0x%02x\n" , edid_ext[i +2 ]);return edid_ext[i +2 ] &EDID_CEA_VCDB_QS ; }Signature · 1 line
2.7.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx