drm/edid: overhaul CEA data block iteration
Subsystems (2)
cover drm/edid: overhaul CEA data block iteration
Add iterators for EDID blocks and CEA data blocks, to iterate through all data blocks across all CEA extensions and CTA blocks in DisplayID data blocks. Fix all code assuming only one CEA extension. Fix code assuming CTA blocks contain everything that CEA extensions do. Sprinkle a bunch of cleanups on top.
This is completely UNTESTED, didn't even smoke test it. It builds. ;)
This superseeds parts of [1] and [2].
BR,
Jani.
[1] https://patchwork.freedesktop.org/series/101241/
[2] https://patchwork.freedesktop.org/patch/msgid/[email protected]
Jani Nikula (19):
drm/edid: add drm_edid_extension_block_count() and drm_edid_size()
drm: use drm_edid_extension_block_count() and drm_edid_size() drm/edid: clean up CEA data block tag definitions drm/edid: add iterator for EDID base and extension blocks drm/edid: add iterator for CEA data blocks
drm/edid: clean up cea_db_is_*() functions
drm/edid: convert add_cea_modes() to use cea db iter drm/edid: convert drm_edid_to_speaker_allocation() to use cea db iter drm/edid: convert drm_edid_to_sad() to use cea db iter drm/edid: convert drm_detect_hdmi_monitor() to use cea db iter drm/edid: convert drm_detect_monitor_audio() to use cea db iter drm/edid: convert drm_parse_cea_ext() to use cea db iter drm/edid: convert drm_edid_to_eld() to use cea db iter drm/edid: sunset the old unused cea data block iterators drm/edid: restore some type safety to cea_db_*() functions drm/edid: detect basic audio only on CEA extension drm/edid: detect color formats and CEA revision only on CEA extension drm/edid: skip CEA extension scan in drm_edid_to_eld() just for CEA
rev
drm/edid: sunset drm_find_cea_extension()
drivers/gpu/drm/drm_connector.c | 2 +- drivers/gpu/drm/drm_debugfs.c | 3 +- drivers/gpu/drm/drm_edid.c | 781 ++++++++++++++++++-------------- include/drm/drm_edid.h | 2 + 4 files changed, 455 insertions(+), 333 deletions(-)
Signature · 1 line
2.30.2
RFC 1/19 drm/edid: add drm_edid_extension_block_count() and drm_edid_size()
Add abstractions for getting the number of EDID extension blocks and the total EDID size in bytes.
--- drivers/gpu/drm/drm_edid.c | 18 ++++++++++++++++++ include/drm/drm_edid.h | 2 ++ 2 files changed, 20 insertions(+)
drivers/gpu/drm/drm_edid.c +18 -0
@@ -2198,6 +2198,24 @@ struct edid *drm_get_edid_switcheroo(struct drm_connector *connector, }EXPORT_SYMBOL (drm_get_edid_switcheroo); +/** +* drm_edid_extension_block_count - get the number of EDID extension blocks +*/ +u8 drm_edid_extension_block_count (const struct edid *edid) +{ +return edid->extensions; +} +EXPORT_SYMBOL (drm_edid_extension_block_count); + +/** +* drm_edid_size - get the EDID size in bytes +*/ +size_t drm_edid_size (const struct edid *edid) +{ +return (drm_edid_extension_block_count (edid) +1 ) *EDID_LENGTH ; +} +EXPORT_SYMBOL (drm_edid_size); +/** * drm_edid_duplicate - duplicate an EDID and the extensions * @edid: EDID to duplicate
include/drm/drm_edid.h +2 -0
@@ -564,6 +564,8 @@ struct edid *drm_get_edid(struct drm_connector *connector,u32 drm_edid_get_panel_id (struct i2c_adapter *adapter);struct edid *drm_get_edid_switcheroo (struct drm_connector *connector,struct i2c_adapter *adapter); +u8 drm_edid_extension_block_count (const struct edid *edid); +size_t drm_edid_size (const struct edid *edid);struct edid *drm_edid_duplicate (const struct edid *edid);int drm_add_edid_modes (struct drm_connector *connector,struct edid *edid);int drm_add_override_edid_modes (struct drm_connector *connector);
Signature · 1 line
2.30.2
Re: [Intel-gfx] [RFC 01/19] drm/edid: add drm_edid_extension_block_count() and drm_edid_size()
Quoted 14 lines · Jani Nikula
Add abstractions for getting the number of EDID extension blocks and the total EDID size in bytes.
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/drm_edid.c | 18 ++++++++++++++++++ include/drm/drm_edid.h | 2 ++ 2 files changed, 20 insertions(+)drivers/gpu/drm/drm_edid.c +0
-0
drivers/gpu/drm/drm_edid.c struct edid *drm_get_edid_switcheroo(struct drm_connector *connector, · line 2204
Quoted 7 lines
drivers/gpu/drm/drm_edid.c +4
-0@@ -2198,6 +2198,24 @@ struct edid *drm_get_edid_switcheroo(struct drm_connector *connector, }EXPORT_SYMBOL (drm_get_edid_switcheroo); +/** +* drm_edid_extension_block_count - get the number of EDID extension blocks +*/ +u8 drm_edid_extension_block_count (const struct edid *edid)
It's just a number, so could be 'int' IMO.
Quoted 32 lines
drivers/gpu/drm/drm_edid.c +14
-0+{ +return edid->extensions; +} +EXPORT_SYMBOL (drm_edid_extension_block_count); + +/** +* drm_edid_size - get the EDID size in bytes +*/ +size_t drm_edid_size (const struct edid *edid) +{ +return (drm_edid_extension_block_count (edid) +1 ) *EDID_LENGTH ; +} +EXPORT_SYMBOL (drm_edid_size); +/** * drm_edid_duplicate - duplicate an EDID and the extensions * @edid: EDID to duplicate include/drm/drm_edid.h +2
-0@@ -564,6 +564,8 @@ struct edid *drm_get_edid(struct drm_connector *connector,u32 drm_edid_get_panel_id (struct i2c_adapter *adapter);struct edid *drm_get_edid_switcheroo (struct drm_connector *connector,struct i2c_adapter *adapter); +u8 drm_edid_extension_block_count (const struct edid *edid); +size_t drm_edid_size (const struct edid *edid);struct edid *drm_edid_duplicate (const struct edid *edid);int drm_add_edid_modes (struct drm_connector *connector,struct edid *edid);int drm_add_override_edid_modes (struct drm_connector *connector);Signature · 1 line
2.30.2
Signature · 2 lines
Ville Syrjälä Intel
RFC 2/19 drm: use drm_edid_extension_block_count() and drm_edid_size()
In reply to Jani NikulaUse the block count and size helpers in all drm core code.
--- drivers/gpu/drm/drm_connector.c | 2 +- drivers/gpu/drm/drm_debugfs.c | 3 +-- drivers/gpu/drm/drm_edid.c | 14 +++++++------- 3 files changed, 9 insertions(+), 10 deletions(-)
drivers/gpu/drm/drm_connector.c +1 -1
@@ -2138,7 +2138,7 @@ int drm_connector_update_edid_property(struct drm_connector *connector,return 0 ;if (edid) - size =EDID_LENGTH * (1 + edid->extensions); + size =drm_edid_size (edid);/* Set the display info, using edid if available, otherwise * resetting the values to defaults. This duplicates the work
drivers/gpu/drm/drm_debugfs.c +1 -2
@@ -362,8 +362,7 @@ static ssize_t edid_write(struct file *file, const char __user *ubuf,if (len ==5 && !strncmp (buf,"reset" ,5 )) { connector->override_edid = false; ret =drm_connector_update_edid_property (connector,NULL ); - }else if (len <EDID_LENGTH || -EDID_LENGTH * (1 + edid->extensions) > len) + }else if (len <EDID_LENGTH ||drm_edid_size (edid) > len) ret = -EINVAL ;else { connector->override_edid = false;
drivers/gpu/drm/drm_edid.c +7 -7
@@ -1643,8 +1643,8 @@ bool drm_edid_are_equal(const struct edid *edid1, const struct edid *edid2)return false;if (edid1) { - edid1_len =EDID_LENGTH * (1 + edid1->extensions); - edid2_len =EDID_LENGTH * (1 + edid2->extensions); + edid1_len =drm_edid_size (edid1); + edid2_len =drm_edid_size (edid2);if (edid1_len != edid2_len)return false;
@@ -1770,7 +1770,7 @@ bool drm_edid_is_valid(struct edid *edid)if (!edid)return false; -for (i =0 ; i <= edid->extensions; i++) +for (i =0 ; i <=drm_edid_extension_block_count (edid); i++)if (!drm_edid_block_valid (raw + i *EDID_LENGTH , i, true,NULL ))return false;
@@ -2224,7 +2224,7 @@ EXPORT_SYMBOL(drm_edid_size);*/ struct edid *drm_edid_duplicate (const struct edid *edid) { -return kmemdup (edid, (edid->extensions +1 ) *EDID_LENGTH ,GFP_KERNEL ); +return kmemdup (edid,drm_edid_size (edid),GFP_KERNEL ); }EXPORT_SYMBOL (drm_edid_duplicate);
@@ -3353,17 +3353,17 @@ const u8 *drm_find_edid_extension(const struct edid *edid,int i;/* No EDID or EDID extensions */ -if (edid ==NULL || edid->extensions ==0 ) +if (edid ==NULL ||drm_edid_extension_block_count (edid) ==0 )return NULL ;/* Find CEA extension */ -for (i = *ext_index; i < edid->extensions; i++) { +for (i = *ext_index; i <drm_edid_extension_block_count (edid); i++) { edid_ext = (const u8 *)edid +EDID_LENGTH * (i +1 );if (edid_ext[0 ] == ext_id)break ; } -if (i >= edid->extensions) +if (i >=drm_edid_extension_block_count (edid))return NULL ; *ext_index = i +1 ;
Signature · 1 line
2.30.2
Re: [RFC 02/19] drm: use drm_edid_extension_block_count() and drm_edid_size()
Quoted 52 lines · Jani Nikula
Use the block count and size helpers in all drm core code.
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/drm_connector.c | 2 +- drivers/gpu/drm/drm_debugfs.c | 3 +-- drivers/gpu/drm/drm_edid.c | 14 +++++++------- 3 files changed, 9 insertions(+), 10 deletions(-)drivers/gpu/drm/drm_connector.c +1
-1@@ -2138,7 +2138,7 @@ int drm_connector_update_edid_property(struct drm_connector *connector,return 0 ;if (edid) - size =EDID_LENGTH * (1 + edid->extensions); + size =drm_edid_size (edid);/* Set the display info, using edid if available, otherwise * resetting the values to defaults. This duplicates the work drivers/gpu/drm/drm_debugfs.c +1
-2@@ -362,8 +362,7 @@ static ssize_t edid_write(struct file *file, const char __user *ubuf,if (len ==5 && !strncmp (buf,"reset" ,5 )) { connector->override_edid = false; ret =drm_connector_update_edid_property (connector,NULL ); - }else if (len <EDID_LENGTH || -EDID_LENGTH * (1 + edid->extensions) > len) + }else if (len <EDID_LENGTH ||drm_edid_size (edid) > len) ret = -EINVAL ;else { connector->override_edid = false;drivers/gpu/drm/drm_edid.c +2
-2@@ -1643,8 +1643,8 @@ bool drm_edid_are_equal(const struct edid *edid1, const struct edid *edid2)return false;if (edid1) { - edid1_len =EDID_LENGTH * (1 + edid1->extensions); - edid2_len =EDID_LENGTH * (1 + edid2->extensions); + edid1_len =drm_edid_size (edid1); + edid2_len =drm_edid_size (edid2);if (edid1_len != edid2_len)return false;
drivers/gpu/drm/drm_edid.c bool drm_edid_is_valid(struct edid *edid) · line 1774
Quoted 6 lines
drivers/gpu/drm/drm_edid.c +1
-1@@ -1770,7 +1770,7 @@ bool drm_edid_is_valid(struct edid *edid)if (!edid)return false; -for (i =0 ; i <= edid->extensions; i++) +for (i =0 ; i <=drm_edid_extension_block_count (edid); i++)if (!drm_edid_block_valid (raw + i *EDID_LENGTH , i, true,NULL ))
Maybe we should also have drm_edid_block_count(), drm_edid_block_data(), drm_edid_extension_block_data() etc.?
Quoted 34 lines
drivers/gpu/drm/drm_edid.c +4
-4return false;@@ -2224,7 +2224,7 @@ EXPORT_SYMBOL(drm_edid_size);*/ struct edid *drm_edid_duplicate (const struct edid *edid) { -return kmemdup (edid, (edid->extensions +1 ) *EDID_LENGTH ,GFP_KERNEL ); +return kmemdup (edid,drm_edid_size (edid),GFP_KERNEL ); }EXPORT_SYMBOL (drm_edid_duplicate);@@ -3353,17 +3353,17 @@ const u8 *drm_find_edid_extension(const struct edid *edid,int i;/* No EDID or EDID extensions */ -if (edid ==NULL || edid->extensions ==0 ) +if (edid ==NULL ||drm_edid_extension_block_count (edid) ==0 )return NULL ;/* Find CEA extension */ -for (i = *ext_index; i < edid->extensions; i++) { +for (i = *ext_index; i <drm_edid_extension_block_count (edid); i++) { edid_ext = (const u8 *)edid +EDID_LENGTH * (i +1 );if (edid_ext[0 ] == ext_id)break ; } -if (i >= edid->extensions) +if (i >=drm_edid_extension_block_count (edid))return NULL ; *ext_index = i +1 ;Signature · 1 line
2.30.2
Signature · 2 lines
Ville Syrjälä Intel
RFC 3/19 drm/edid: clean up CEA data block tag definitions
In reply to Jani NikulaAdd prefixed names, group, sort, add references.
--- drivers/gpu/drm/drm_edid.c | 59 +++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 27 deletions(-)
drivers/gpu/drm/drm_edid.c +32 -27
@@ -3329,15 +3329,20 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid,return closure.modes; } -#define AUDIO_BLOCK 0x01 -#define VIDEO_BLOCK 0x02 -#define VENDOR_BLOCK 0x03 -#define SPEAKER_BLOCK 0x04 -#define HDR_STATIC_METADATA_BLOCK 0x6 -#define USE_EXTENDED_TAG 0x07 -#define EXT_VIDEO_CAPABILITY_BLOCK 0x00 -#define EXT_VIDEO_DATA_BLOCK_420 0x0E -#define EXT_VIDEO_CAP_BLOCK_Y420CMDB 0x0F +/* CEA-861-F Table 44 CEA Data Block Tag Codes */ +#define CEA_DB_AUDIO 1 +#define CEA_DB_VIDEO 2 +#define CEA_DB_VENDOR 3 +#define CEA_DB_SPEAKER 4 +#define CEA_DB_EXTENDED_TAG 7 + +/* CEA-861-F Table 46 CEA Data Block Tag Codes */ +#define CEA_EXT_DB_VIDEO_CAP 0 +#define CEA_EXT_DB_VENDOR 1 +#define CEA_EXT_DB_HDR_STATIC_METADATA 6/* CEA-861.3 2005 */ +#define CEA_EXT_DB_420_VIDEO_DATA 14 +#define CEA_EXT_DB_420_VIDEO_CAP_MAP 15 +#define EDID_BASIC_AUDIO (1 << 6)#define EDID_CEA_YCRCB444 (1 << 5)#define EDID_CEA_YCRCB422 (1 << 4)
@@ -4220,7 +4225,7 @@ cea_db_offsets(const u8 *cea, int *start, int *end)static bool cea_db_is_hdmi_vsdb (const u8 *db) { -if (cea_db_tag (db) !=VENDOR_BLOCK ) +if (cea_db_tag (db) !=CEA_DB_VENDOR )return false;if (cea_db_payload_len (db) <5 )
@@ -4231,7 +4236,7 @@ static bool cea_db_is_hdmi_vsdb(const u8 *db)static bool cea_db_is_hdmi_forum_vsdb (const u8 *db) { -if (cea_db_tag (db) !=VENDOR_BLOCK ) +if (cea_db_tag (db) !=CEA_DB_VENDOR )return false;if (cea_db_payload_len (db) <7 )
@@ -4242,7 +4247,7 @@ static bool cea_db_is_hdmi_forum_vsdb(const u8 *db)static bool cea_db_is_microsoft_vsdb (const u8 *db) { -if (cea_db_tag (db) !=VENDOR_BLOCK ) +if (cea_db_tag (db) !=CEA_DB_VENDOR )return false;if (cea_db_payload_len (db) !=21 )
@@ -4253,13 +4258,13 @@ static bool cea_db_is_microsoft_vsdb(const u8 *db)static bool cea_db_is_vcdb (const u8 *db) { -if (cea_db_tag (db) !=USE_EXTENDED_TAG ) +if (cea_db_tag (db) !=CEA_DB_EXTENDED_TAG )return false;if (cea_db_payload_len (db) !=2 )return false; -if (cea_db_extended_tag (db) !=EXT_VIDEO_CAPABILITY_BLOCK ) +if (cea_db_extended_tag (db) !=CEA_EXT_DB_VIDEO_CAP )return false;return true;
@@ -4267,13 +4272,13 @@ static bool cea_db_is_vcdb(const u8 *db)static bool cea_db_is_y420cmdb (const u8 *db) { -if (cea_db_tag (db) !=USE_EXTENDED_TAG ) +if (cea_db_tag (db) !=CEA_DB_EXTENDED_TAG )return false;if (!cea_db_payload_len (db))return false; -if (cea_db_extended_tag (db) !=EXT_VIDEO_CAP_BLOCK_Y420CMDB ) +if (cea_db_extended_tag (db) !=CEA_EXT_DB_420_VIDEO_CAP_MAP )return false;return true;
@@ -4281,13 +4286,13 @@ static bool cea_db_is_y420cmdb(const u8 *db)static bool cea_db_is_y420vdb (const u8 *db) { -if (cea_db_tag (db) !=USE_EXTENDED_TAG ) +if (cea_db_tag (db) !=CEA_DB_EXTENDED_TAG )return false;if (!cea_db_payload_len (db))return false; -if (cea_db_extended_tag (db) !=EXT_VIDEO_DATA_BLOCK_420 ) +if (cea_db_extended_tag (db) !=CEA_EXT_DB_420_VIDEO_DATA )return false;return true;
@@ -4354,7 +4359,7 @@ add_cea_modes(struct drm_connector *connector, struct edid *edid) db = &cea[i]; dbl =cea_db_payload_len (db); -if (cea_db_tag (db) ==VIDEO_BLOCK ) { +if (cea_db_tag (db) ==CEA_DB_VIDEO ) { video = db +1 ; video_len = dbl; modes +=do_cea_modes (connector, video, dbl);
@@ -4428,10 +4433,10 @@ static void fixup_detailed_cea_mode_clock(struct drm_display_mode *mode)static bool cea_db_is_hdmi_hdr_metadata_block (const u8 *db) { -if (cea_db_tag (db) !=USE_EXTENDED_TAG ) +if (cea_db_tag (db) !=CEA_DB_EXTENDED_TAG )return false; -if (db[1 ] !=HDR_STATIC_METADATA_BLOCK ) +if (db[1 ] !=CEA_EXT_DB_HDR_STATIC_METADATA )return false;if (cea_db_payload_len (db) <3 )
@@ -4622,7 +4627,7 @@ static void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid) dbl =cea_db_payload_len (db);switch (cea_db_tag (db)) { -case AUDIO_BLOCK : +case CEA_DB_AUDIO :/* Audio Data Block, contains SADs */ sad_count =min (dbl /3 ,15 - total_sad_count);if (sad_count >=1 )
@@ -4630,12 +4635,12 @@ static void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid) &db[1], sad_count * 3); total_sad_count += sad_count;break ; -case SPEAKER_BLOCK : +case CEA_DB_SPEAKER :/* Speaker Allocation Data Block */ if (dbl >=1 ) eld[DRM_ELD_SPEAKER ] = db[1 ];break ; -case VENDOR_BLOCK : +case CEA_DB_VENDOR :/* HDMI Vendor-Specific Data Block */ if (cea_db_is_hdmi_vsdb (db))drm_parse_hdmi_vsdb_audio (connector, db);
@@ -4696,7 +4701,7 @@ int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads)for_each_cea_db (cea, i, start, end) {const u8 *db = &cea[i]; -if (cea_db_tag (db) ==AUDIO_BLOCK ) { +if (cea_db_tag (db) ==CEA_DB_AUDIO ) {int j; dbl =cea_db_payload_len (db);
@@ -4758,7 +4763,7 @@ int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb)for_each_cea_db (cea, i, start, end) {const u8 *db = &cea[i]; -if (cea_db_tag (db) ==SPEAKER_BLOCK ) { +if (cea_db_tag (db) ==CEA_DB_SPEAKER ) { dbl =cea_db_payload_len (db);/* Speaker Allocation Data Block */
@@ -4888,7 +4893,7 @@ bool drm_detect_monitor_audio(struct edid *edid) goto end;for_each_cea_db (edid_ext, i, start_offset, end_offset) { -if (cea_db_tag (&edid_ext[i]) ==AUDIO_BLOCK ) { +if (cea_db_tag (&edid_ext[i]) ==CEA_DB_AUDIO ) { has_audio = true;for (j =1 ; j <cea_db_payload_len (&edid_ext[i]) +1 ; j +=3 ) DRM_DEBUG_KMS("CEA audio format %d\n",
Signature · 1 line
2.30.2
Re: [Intel-gfx] [RFC 03/19] drm/edid: clean up CEA data block tag definitions
Quoted 15 lines · Jani Nikula
Add prefixed names, group, sort, add references.
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/drm_edid.c | 59 +++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 27 deletions(-)drivers/gpu/drm/drm_edid.c +0
-0@@ -3329,15 +3329,20 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid,return closure.modes; }
drivers/gpu/drm/drm_edid.c add_detailed_modes(struct drm_connector *connector, struct edid *edid, · line 3332
Quoted 10 lines
drivers/gpu/drm/drm_edid.c +1
-9-#define AUDIO_BLOCK 0x01 -#define VIDEO_BLOCK 0x02 -#define VENDOR_BLOCK 0x03 -#define SPEAKER_BLOCK 0x04 -#define HDR_STATIC_METADATA_BLOCK 0x6 -#define USE_EXTENDED_TAG 0x07 -#define EXT_VIDEO_CAPABILITY_BLOCK 0x00 -#define EXT_VIDEO_DATA_BLOCK_420 0x0E -#define EXT_VIDEO_CAP_BLOCK_Y420CMDB 0x0F +/* CEA-861-F Table 44 CEA Data Block Tag Codes */
Table 55 in CTA-861-G, if we want to use a more recent reference. Though IIRC someone did say CTA-861-H might already be out as well.
drivers/gpu/drm/drm_edid.c add_detailed_modes(struct drm_connector *connector, struct edid *edid, · line 3339
Quoted 7 lines
drivers/gpu/drm/drm_edid.c +7
-0+#define CEA_DB_AUDIO 1 +#define CEA_DB_VIDEO 2 +#define CEA_DB_VENDOR 3 +#define CEA_DB_SPEAKER 4 +#define CEA_DB_EXTENDED_TAG 7 + +/* CEA-861-F Table 46 CEA Data Block Tag Codes */
Table 57 in CTA-861-G.
Quoted 159 lines
drivers/gpu/drm/drm_edid.c +24
-18+#define CEA_EXT_DB_VIDEO_CAP 0 +#define CEA_EXT_DB_VENDOR 1 +#define CEA_EXT_DB_HDR_STATIC_METADATA 6/* CEA-861.3 2005 */ +#define CEA_EXT_DB_420_VIDEO_DATA 14 +#define CEA_EXT_DB_420_VIDEO_CAP_MAP 15 +#define EDID_BASIC_AUDIO (1 << 6)#define EDID_CEA_YCRCB444 (1 << 5)#define EDID_CEA_YCRCB422 (1 << 4)@@ -4220,7 +4225,7 @@ cea_db_offsets(const u8 *cea, int *start, int *end)static bool cea_db_is_hdmi_vsdb (const u8 *db) { -if (cea_db_tag (db) !=VENDOR_BLOCK ) +if (cea_db_tag (db) !=CEA_DB_VENDOR )return false;if (cea_db_payload_len (db) <5 )@@ -4231,7 +4236,7 @@ static bool cea_db_is_hdmi_vsdb(const u8 *db)static bool cea_db_is_hdmi_forum_vsdb (const u8 *db) { -if (cea_db_tag (db) !=VENDOR_BLOCK ) +if (cea_db_tag (db) !=CEA_DB_VENDOR )return false;if (cea_db_payload_len (db) <7 )@@ -4242,7 +4247,7 @@ static bool cea_db_is_hdmi_forum_vsdb(const u8 *db)static bool cea_db_is_microsoft_vsdb (const u8 *db) { -if (cea_db_tag (db) !=VENDOR_BLOCK ) +if (cea_db_tag (db) !=CEA_DB_VENDOR )return false;if (cea_db_payload_len (db) !=21 )@@ -4253,13 +4258,13 @@ static bool cea_db_is_microsoft_vsdb(const u8 *db)static bool cea_db_is_vcdb (const u8 *db) { -if (cea_db_tag (db) !=USE_EXTENDED_TAG ) +if (cea_db_tag (db) !=CEA_DB_EXTENDED_TAG )return false;if (cea_db_payload_len (db) !=2 )return false; -if (cea_db_extended_tag (db) !=EXT_VIDEO_CAPABILITY_BLOCK ) +if (cea_db_extended_tag (db) !=CEA_EXT_DB_VIDEO_CAP )return false;return true;@@ -4267,13 +4272,13 @@ static bool cea_db_is_vcdb(const u8 *db)static bool cea_db_is_y420cmdb (const u8 *db) { -if (cea_db_tag (db) !=USE_EXTENDED_TAG ) +if (cea_db_tag (db) !=CEA_DB_EXTENDED_TAG )return false;if (!cea_db_payload_len (db))return false; -if (cea_db_extended_tag (db) !=EXT_VIDEO_CAP_BLOCK_Y420CMDB ) +if (cea_db_extended_tag (db) !=CEA_EXT_DB_420_VIDEO_CAP_MAP )return false;return true;@@ -4281,13 +4286,13 @@ static bool cea_db_is_y420cmdb(const u8 *db)static bool cea_db_is_y420vdb (const u8 *db) { -if (cea_db_tag (db) !=USE_EXTENDED_TAG ) +if (cea_db_tag (db) !=CEA_DB_EXTENDED_TAG )return false;if (!cea_db_payload_len (db))return false; -if (cea_db_extended_tag (db) !=EXT_VIDEO_DATA_BLOCK_420 ) +if (cea_db_extended_tag (db) !=CEA_EXT_DB_420_VIDEO_DATA )return false;return true;@@ -4354,7 +4359,7 @@ add_cea_modes(struct drm_connector *connector, struct edid *edid) db = &cea[i]; dbl =cea_db_payload_len (db); -if (cea_db_tag (db) ==VIDEO_BLOCK ) { +if (cea_db_tag (db) ==CEA_DB_VIDEO ) { video = db +1 ; video_len = dbl; modes +=do_cea_modes (connector, video, dbl);@@ -4428,10 +4433,10 @@ static void fixup_detailed_cea_mode_clock(struct drm_display_mode *mode)static bool cea_db_is_hdmi_hdr_metadata_block (const u8 *db) { -if (cea_db_tag (db) !=USE_EXTENDED_TAG ) +if (cea_db_tag (db) !=CEA_DB_EXTENDED_TAG )return false; -if (db[1 ] !=HDR_STATIC_METADATA_BLOCK ) +if (db[1 ] !=CEA_EXT_DB_HDR_STATIC_METADATA )return false;if (cea_db_payload_len (db) <3 )@@ -4622,7 +4627,7 @@ static void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid) dbl =cea_db_payload_len (db);switch (cea_db_tag (db)) { -case AUDIO_BLOCK : +case CEA_DB_AUDIO :/* Audio Data Block, contains SADs */ sad_count =min (dbl /3 ,15 - total_sad_count);if (sad_count >=1 )@@ -4630,12 +4635,12 @@ static void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid) &db[1], sad_count * 3); total_sad_count += sad_count;break ; -case SPEAKER_BLOCK : +case CEA_DB_SPEAKER :/* Speaker Allocation Data Block */ if (dbl >=1 ) eld[DRM_ELD_SPEAKER ] = db[1 ];break ; -case VENDOR_BLOCK : +case CEA_DB_VENDOR :/* HDMI Vendor-Specific Data Block */ if (cea_db_is_hdmi_vsdb (db))drm_parse_hdmi_vsdb_audio (connector, db);@@ -4696,7 +4701,7 @@ int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads)for_each_cea_db (cea, i, start, end) {const u8 *db = &cea[i]; -if (cea_db_tag (db) ==AUDIO_BLOCK ) { +if (cea_db_tag (db) ==CEA_DB_AUDIO ) {int j; dbl =cea_db_payload_len (db);@@ -4758,7 +4763,7 @@ int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb)for_each_cea_db (cea, i, start, end) {const u8 *db = &cea[i]; -if (cea_db_tag (db) ==SPEAKER_BLOCK ) { +if (cea_db_tag (db) ==CEA_DB_SPEAKER ) { dbl =cea_db_payload_len (db);/* Speaker Allocation Data Block */ @@ -4888,7 +4893,7 @@ bool drm_detect_monitor_audio(struct edid *edid) goto end;for_each_cea_db (edid_ext, i, start_offset, end_offset) { -if (cea_db_tag (&edid_ext[i]) ==AUDIO_BLOCK ) { +if (cea_db_tag (&edid_ext[i]) ==CEA_DB_AUDIO ) { has_audio = true;for (j =1 ; j <cea_db_payload_len (&edid_ext[i]) +1 ; j +=3 ) DRM_DEBUG_KMS("CEA audio format %d\n",Signature · 1 line
2.30.2
Signature · 2 lines
Ville Syrjälä Intel
RFC 4/19 drm/edid: add iterator for EDID base and extension blocks
In reply to Jani NikulaAdd an iterator abstraction for going through all the EDID blocks.
--- drivers/gpu/drm/drm_edid.c | 46 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)
drivers/gpu/drm/drm_edid.c +46 -0
@@ -3348,6 +3348,52 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid,#define EDID_CEA_YCRCB422 (1 << 4)#define EDID_CEA_VCDB_QS (1 << 6) +/* +* EDID base and extension block iterator. +* +* struct drm_edid_iter iter; +* const u8 *block; +* +* drm_edid_iter_begin(edid, &iter); +* drm_edid_iter_for_each(block, &iter) { +* // do stuff with block +* } +* drm_edid_iter_end(&iter); +*/ +struct drm_edid_iter { +const struct edid *edid; + +/* Current block index. */ +int index; +}; + +static void drm_edid_iter_begin (const struct edid *edid, +struct drm_edid_iter *iter) +{ +memset (iter,0 ,sizeof (*iter)); + + iter->edid = edid; +} + +static const void *__drm_edid_iter_next (struct drm_edid_iter *iter) +{ +if (!iter->edid) +return NULL ; + +if (iter->index >drm_edid_extension_block_count (iter->edid)) +return NULL ; + +return (const u8 *)iter->edid +EDID_LENGTH * iter->index++; +} + +#define drm_edid_iter_for_each (__block, __iter) \ + while (((__block) = __drm_edid_iter_next(__iter))) + +static void drm_edid_iter_end (struct drm_edid_iter *iter) +{ +memset (iter,0 ,sizeof (*iter)); +} +/* * Search EDID for CEA extension block. */
Signature · 1 line
2.30.2
RFC 5/19 drm/edid: add iterator for CEA data blocks
In reply to Jani NikulaAdd an iterator for CEA Data Blocks across CEA extensions and CTA DisplayID Data Blocks.
--- drivers/gpu/drm/drm_edid.c | 198 ++++++++++++++++++++++++++++++++++--- 1 file changed, 186 insertions(+), 12 deletions(-)
drivers/gpu/drm/drm_edid.c +186 -12
@@ -4196,24 +4196,12 @@ do_hdmi_vsdb_modes(struct drm_connector *connector, const u8 *db, u8 len,return modes; } -static int -cea_db_payload_len (const u8 *db) -{ -return db[0 ] &0x1f ; -} -static int cea_db_extended_tag (const u8 *db) {return db[1 ]; } -static int -cea_db_tag (const u8 *db) -{ -return db[0 ] >>5 ; -} -static int cea_revision (const u8 *cea) {
@@ -4269,6 +4257,192 @@ cea_db_offsets(const u8 *cea, int *start, int *end)return 0 ; } +/* +* CEA Data Block iterator. +* +* Iterate through all CEA Data Blocks in both EDID CEA extensions and CTA Data +* Blocks in DisplayID extension blocks. +* +* struct cea_db *db: +* struct cea_db_iter iter; +* +* cea_db_iter_edid_begin(edid, &iter); +* cea_db_iter_for_each(db, &iter) { +* // do stuff with db +* } +* cea_db_iter_end(&iter); +*/ +struct cea_db_iter { +struct drm_edid_iter edid_iter; +struct displayid_iter displayid_iter; + +/* Current Data Block Collection. */ +const u8 *collection; + +/* Current Data Block index in current collection. */ +int index; + +/* End index in current collection. */ +int end; +}; + +/* CEA-861-F section 7.5 CEA Extension Version 3 and Table 43 */ +struct cea_db { +u8 tag_length; +u8 data[]; +} __packed; + +static int cea_db_tag (const void *_db) +{ +/* FIXME: Transition to passing struct cea_db * everywhere. */ +const struct cea_db *db = _db; + +return db->tag_length >>5 ; +} + +static int cea_db_payload_len (const void *_db) +{ +/* FIXME: Transition to passing struct cea_db * everywhere. */ +const struct cea_db *db = _db; + +return db->tag_length &0x1f ; +} + +static const void *cea_db_data (const struct cea_db *db) +{ +return db->data; +} + +static void cea_db_iter_edid_begin (const struct edid *edid,struct cea_db_iter *iter) +{ +memset (iter,0 ,sizeof (*iter)); + +drm_edid_iter_begin (edid, &iter->edid_iter); +displayid_iter_edid_begin (edid, &iter->displayid_iter); +} + +static const struct cea_db * +__cea_db_iter_current_block (const struct cea_db_iter *iter) +{ +const struct cea_db *db; + +if (!iter->collection) +return NULL ; + + db = (const struct cea_db *)&iter->collection[iter->index]; + +if (iter->index +sizeof (*db) <= iter->end && + iter->index +sizeof (*db) +cea_db_payload_len (db) <= iter->end) +return db; + +return NULL ; +} + +/* +* References: +* - VESA E-EDID v1.4 +* - CEA-861-F section 7.5 CEA Extension Version 3 +*/ +static const void *__cea_db_iter_edid_next (struct cea_db_iter *iter) +{ +const u8 *ext; + +drm_edid_iter_for_each (ext, &iter->edid_iter) { +/* Only support CEA extension revision 3+ */ +if (ext[0 ] !=CEA_EXT ||cea_revision (ext) <3 ) +continue ; + + iter->index =4 ; + iter->end = ext[2 ]; +if (iter->end ==0 ) + iter->end =127 ; +if (iter->end <4 || iter->end >127 ) +continue ; + +return ext; + } + +return NULL ; +} + +/* +* References: +* - DisplayID v1.3 Appendix C: CEA Data Block within a DisplayID Data Block +* - DisplayID v2.0 section 4.10 CTA DisplayID Data Block +* +* Note that the above do not specify any connection between DisplayID Data +* Block revision and CEA Extension versions. +*/ +static const void *__cea_db_iter_displayid_next (struct cea_db_iter *iter) +{ +const struct displayid_block *block; + +displayid_iter_for_each (block, &iter->displayid_iter) { +if (block->tag !=DATA_BLOCK_CTA ) +continue ; + + iter->index =sizeof (*block); + iter->end = iter->index + block->num_bytes; + +return block; + } + +return NULL ; +} + +static const struct cea_db *__cea_db_iter_next (struct cea_db_iter *iter) +{ +const struct cea_db *db; + +if (iter->collection) { +/* Current collection should always be valid. */ + db =__cea_db_iter_current_block (iter); +if (WARN_ON (!db)) { + iter->collection =NULL ; +return NULL ; + } + +/* Next block in CEA Data Block Collection */ + iter->index +=sizeof (*db) +cea_db_payload_len (db); + + db =__cea_db_iter_current_block (iter); +if (db) +return db; + } + +for (;;) { +/* +* Find the next CEA Data Block Collection. First iterate all +* the EDID CEA extensions, then all the DisplayID CTA blocks. +* +* Per DisplayID v1.3 Appendix B: DisplayID as an EDID +* Extension, it's recommended that DisplayID extensions are +* exposed after all of the CEA extensions. +*/ + iter->collection =__cea_db_iter_edid_next (iter); +if (!iter->collection) + iter->collection =__cea_db_iter_displayid_next (iter); + +if (!iter->collection) +return NULL ; + + db =__cea_db_iter_current_block (iter); +if (db) +return db; + } +} + +#define cea_db_iter_for_each (__db, __iter) \ + while (((__db) = __cea_db_iter_next(__iter))) + +static void cea_db_iter_end (struct cea_db_iter *iter) +{ +displayid_iter_end (&iter->displayid_iter); +drm_edid_iter_end (&iter->edid_iter); + +memset (iter,0 ,sizeof (*iter)); +} +static bool cea_db_is_hdmi_vsdb (const u8 *db) {if (cea_db_tag (db) !=CEA_DB_VENDOR )
Signature · 1 line
2.30.2
Re: [RFC 05/19] drm/edid: add iterator for CEA data blocks
Quoted 157 lines · Jani Nikula
Add an iterator for CEA Data Blocks across CEA extensions and CTA DisplayID Data Blocks.
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/drm_edid.c | 198 ++++++++++++++++++++++++++++++++++--- 1 file changed, 186 insertions(+), 12 deletions(-)drivers/gpu/drm/drm_edid.c +116
-12@@ -4196,24 +4196,12 @@ do_hdmi_vsdb_modes(struct drm_connector *connector, const u8 *db, u8 len,return modes; } -static int -cea_db_payload_len (const u8 *db) -{ -return db[0 ] &0x1f ; -} -static int cea_db_extended_tag (const u8 *db) {return db[1 ]; } -static int -cea_db_tag (const u8 *db) -{ -return db[0 ] >>5 ; -} -static int cea_revision (const u8 *cea) {@@ -4269,6 +4257,192 @@ cea_db_offsets(const u8 *cea, int *start, int *end)return 0 ; } +/* +* CEA Data Block iterator. +* +* Iterate through all CEA Data Blocks in both EDID CEA extensions and CTA Data +* Blocks in DisplayID extension blocks. +* +* struct cea_db *db: +* struct cea_db_iter iter; +* +* cea_db_iter_edid_begin(edid, &iter); +* cea_db_iter_for_each(db, &iter) { +* // do stuff with db +* } +* cea_db_iter_end(&iter); +*/ +struct cea_db_iter { +struct drm_edid_iter edid_iter; +struct displayid_iter displayid_iter; + +/* Current Data Block Collection. */ +const u8 *collection; + +/* Current Data Block index in current collection. */ +int index; + +/* End index in current collection. */ +int end; +}; + +/* CEA-861-F section 7.5 CEA Extension Version 3 and Table 43 */ +struct cea_db { +u8 tag_length; +u8 data[]; +} __packed; + +static int cea_db_tag (const void *_db) +{ +/* FIXME: Transition to passing struct cea_db * everywhere. */ +const struct cea_db *db = _db; + +return db->tag_length >>5 ; +} + +static int cea_db_payload_len (const void *_db) +{ +/* FIXME: Transition to passing struct cea_db * everywhere. */ +const struct cea_db *db = _db; + +return db->tag_length &0x1f ; +} + +static const void *cea_db_data (const struct cea_db *db) +{ +return db->data; +} + +static void cea_db_iter_edid_begin (const struct edid *edid,struct cea_db_iter *iter) +{ +memset (iter,0 ,sizeof (*iter)); + +drm_edid_iter_begin (edid, &iter->edid_iter); +displayid_iter_edid_begin (edid, &iter->displayid_iter); +} + +static const struct cea_db * +__cea_db_iter_current_block (const struct cea_db_iter *iter) +{ +const struct cea_db *db; + +if (!iter->collection) +return NULL ; + + db = (const struct cea_db *)&iter->collection[iter->index]; + +if (iter->index +sizeof (*db) <= iter->end && + iter->index +sizeof (*db) +cea_db_payload_len (db) <= iter->end) +return db; + +return NULL ; +} + +/* +* References: +* - VESA E-EDID v1.4 +* - CEA-861-F section 7.5 CEA Extension Version 3 +*/ +static const void *__cea_db_iter_edid_next (struct cea_db_iter *iter) +{ +const u8 *ext; + +drm_edid_iter_for_each (ext, &iter->edid_iter) { +/* Only support CEA extension revision 3+ */ +if (ext[0 ] !=CEA_EXT ||cea_revision (ext) <3 ) +continue ; + + iter->index =4 ; + iter->end = ext[2 ]; +if (iter->end ==0 ) + iter->end =127 ; +if (iter->end <4 || iter->end >127 ) +continue ; + +return ext; + } + +return NULL ; +} + +/* +* References: +* - DisplayID v1.3 Appendix C: CEA Data Block within a DisplayID Data Block +* - DisplayID v2.0 section 4.10 CTA DisplayID Data Block +* +* Note that the above do not specify any connection between DisplayID Data +* Block revision and CEA Extension versions. +*/
drivers/gpu/drm/drm_edid.c cea_db_offsets(const u8 *cea, int *start, int *end) · line 4385
Quoted 10 lines
drivers/gpu/drm/drm_edid.c +10
-0+static const void *__cea_db_iter_displayid_next (struct cea_db_iter *iter) +{ +const struct displayid_block *block; + +displayid_iter_for_each (block, &iter->displayid_iter) { +if (block->tag !=DATA_BLOCK_CTA ) +continue ; + + iter->index =sizeof (*block); + iter->end = iter->index + block->num_bytes;
I'd like to keep the comment from cea_db_offsets() reminding us why we can trust this thing.
Overall looks pretty nice to my eyes.
Quoted 65 lines
drivers/gpu/drm/drm_edid.c +60
-0+ +return block; + } + +return NULL ; +} + +static const struct cea_db *__cea_db_iter_next (struct cea_db_iter *iter) +{ +const struct cea_db *db; + +if (iter->collection) { +/* Current collection should always be valid. */ + db =__cea_db_iter_current_block (iter); +if (WARN_ON (!db)) { + iter->collection =NULL ; +return NULL ; + } + +/* Next block in CEA Data Block Collection */ + iter->index +=sizeof (*db) +cea_db_payload_len (db); + + db =__cea_db_iter_current_block (iter); +if (db) +return db; + } + +for (;;) { +/* +* Find the next CEA Data Block Collection. First iterate all +* the EDID CEA extensions, then all the DisplayID CTA blocks. +* +* Per DisplayID v1.3 Appendix B: DisplayID as an EDID +* Extension, it's recommended that DisplayID extensions are +* exposed after all of the CEA extensions. +*/ + iter->collection =__cea_db_iter_edid_next (iter); +if (!iter->collection) + iter->collection =__cea_db_iter_displayid_next (iter); + +if (!iter->collection) +return NULL ; + + db =__cea_db_iter_current_block (iter); +if (db) +return db; + } +} + +#define cea_db_iter_for_each (__db, __iter) \ + while (((__db) = __cea_db_iter_next(__iter))) + +static void cea_db_iter_end (struct cea_db_iter *iter) +{ +displayid_iter_end (&iter->displayid_iter); +drm_edid_iter_end (&iter->edid_iter); + +memset (iter,0 ,sizeof (*iter)); +} +static bool cea_db_is_hdmi_vsdb (const u8 *db) {if (cea_db_tag (db) !=CEA_DB_VENDOR )Signature · 1 line
2.30.2
Signature · 2 lines
Ville Syrjälä Intel
RFC 6/19 drm/edid: clean up cea_db_is_*() functions
In reply to Jani NikulaAbstract helpers for matching vendor data blocks and extended tags, and use them to simplify all the cea_db_is_*() functions.
Take void pointer as parameter to allow transitional use for both u8 * and struct cea_db *.
--- drivers/gpu/drm/drm_edid.c | 113 ++++++++++++------------------------- 1 file changed, 37 insertions(+), 76 deletions(-)
drivers/gpu/drm/drm_edid.c +37 -76
@@ -4196,12 +4196,6 @@ do_hdmi_vsdb_modes(struct drm_connector *connector, const u8 *db, u8 len,return modes; } -static int -cea_db_extended_tag (const u8 *db) -{ -return db[1 ]; -} -static int cea_revision (const u8 *cea) {
@@ -4313,6 +4307,22 @@ static const void *cea_db_data(const struct cea_db *db)return db->data; } +static bool cea_db_is_extended_tag (const struct cea_db *db,int tag) +{ +return (cea_db_tag (db) ==CEA_DB_EXTENDED_TAG && +cea_db_payload_len (db) >=1 && + db->data[0 ] == tag); +} + +static bool cea_db_is_vendor (const struct cea_db *db,int vendor_oui) +{ +const u8 *data =cea_db_data (db); + +return (cea_db_tag (db) ==CEA_DB_VENDOR && +cea_db_payload_len (db) >=3 && +oui (data[2 ], data[1 ], data[0 ]) == vendor_oui); +} +static void cea_db_iter_edid_begin (const struct edid *edid,struct cea_db_iter *iter) {memset (iter,0 ,sizeof (*iter));
@@ -4443,79 +4453,44 @@ static void cea_db_iter_end(struct cea_db_iter *iter)memset (iter,0 ,sizeof (*iter)); } -static bool cea_db_is_hdmi_vsdb (const u8 *db) +static bool cea_db_is_hdmi_vsdb (const void *db) { -if (cea_db_tag (db) !=CEA_DB_VENDOR ) -return false; - -if (cea_db_payload_len (db) <5 ) -return false; - -return oui (db[3 ], db[2 ], db[1 ]) ==HDMI_IEEE_OUI ; +return (cea_db_is_vendor (db,HDMI_IEEE_OUI ) && +cea_db_payload_len (db) >=5 ); } -static bool cea_db_is_hdmi_forum_vsdb (const u8 *db) +static bool cea_db_is_hdmi_forum_vsdb (const void *db) { -if (cea_db_tag (db) !=CEA_DB_VENDOR ) -return false; - -if (cea_db_payload_len (db) <7 ) -return false; - -return oui (db[3 ], db[2 ], db[1 ]) ==HDMI_FORUM_IEEE_OUI ; +return (cea_db_is_vendor (db,HDMI_FORUM_IEEE_OUI ) && +cea_db_payload_len (db) >=7 ); } -static bool cea_db_is_microsoft_vsdb (const u8 *db) +static bool cea_db_is_microsoft_vsdb (const void *db) { -if (cea_db_tag (db) !=CEA_DB_VENDOR ) -return false; - -if (cea_db_payload_len (db) !=21 ) -return false; - -return oui (db[3 ], db[2 ], db[1 ]) ==MICROSOFT_IEEE_OUI ; +return (cea_db_is_vendor (db,MICROSOFT_IEEE_OUI ) && +cea_db_payload_len (db) ==21 ); } -static bool cea_db_is_vcdb (const u8 *db) +static bool cea_db_is_vcdb (const void *db) { -if (cea_db_tag (db) !=CEA_DB_EXTENDED_TAG ) -return false; - -if (cea_db_payload_len (db) !=2 ) -return false; - -if (cea_db_extended_tag (db) !=CEA_EXT_DB_VIDEO_CAP ) -return false; - -return true; +return (cea_db_is_extended_tag (db,CEA_EXT_DB_VIDEO_CAP ) && +cea_db_payload_len (db) ==2 ); } -static bool cea_db_is_y420cmdb (const u8 *db) +static bool cea_db_is_y420cmdb (const void *db) { -if (cea_db_tag (db) !=CEA_DB_EXTENDED_TAG ) -return false; - -if (!cea_db_payload_len (db)) -return false; - -if (cea_db_extended_tag (db) !=CEA_EXT_DB_420_VIDEO_CAP_MAP ) -return false; - -return true; +return cea_db_is_extended_tag (db,CEA_EXT_DB_420_VIDEO_CAP_MAP ); } -static bool cea_db_is_y420vdb (const u8 *db) +static bool cea_db_is_y420vdb (const void *db) { -if (cea_db_tag (db) !=CEA_DB_EXTENDED_TAG ) -return false; - -if (!cea_db_payload_len (db)) -return false; - -if (cea_db_extended_tag (db) !=CEA_EXT_DB_420_VIDEO_DATA ) -return false; +return cea_db_is_extended_tag (db,CEA_EXT_DB_420_VIDEO_DATA ); +} -return true; +static bool cea_db_is_hdmi_hdr_metadata_block (const void *db) +{ +return (cea_db_is_extended_tag (db,CEA_EXT_DB_HDR_STATIC_METADATA ) && +cea_db_payload_len (db) >=3 ); }#define for_each_cea_db (cea, i, start, end) \
@@ -4651,20 +4626,6 @@ static void fixup_detailed_cea_mode_clock(struct drm_display_mode *mode) mode->clock = clock; } -static bool cea_db_is_hdmi_hdr_metadata_block (const u8 *db) -{ -if (cea_db_tag (db) !=CEA_DB_EXTENDED_TAG ) -return false; - -if (db[1 ] !=CEA_EXT_DB_HDR_STATIC_METADATA ) -return false; - -if (cea_db_payload_len (db) <3 ) -return false; - -return true; -} -static uint8_t eotf_supported (const u8 *edid_ext) { return edid_ext[2] &
Signature · 1 line
2.30.2
Re: [Intel-gfx] [RFC 06/19] drm/edid: clean up cea_db_is_*() functions
Quoted 29 lines · Jani Nikula
Abstract helpers for matching vendor data blocks and extended tags, and use them to simplify all the cea_db_is_*() functions.
Take void pointer as parameter to allow transitional use for both u8 * and struct
cea_db*.Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/drm_edid.c | 113 ++++++++++++------------------------- 1 file changed, 37 insertions(+), 76 deletions(-)drivers/gpu/drm/drm_edid.c +0
-6@@ -4196,12 +4196,6 @@ do_hdmi_vsdb_modes(struct drm_connector *connector, const u8 *db, u8 len,return modes; } -static int -cea_db_extended_tag (const u8 *db) -{ -return db[1 ]; -} -static int cea_revision (const u8 *cea) {
drivers/gpu/drm/drm_edid.c static const void *cea_db_data(const struct cea_db *db) · line 4315
Quoted 9 lines
drivers/gpu/drm/drm_edid.c +6
-0@@ -4313,6 +4307,22 @@ static const void *cea_db_data(const struct cea_db *db)return db->data; } +static bool cea_db_is_extended_tag (const struct cea_db *db,int tag) +{ +return (cea_db_tag (db) ==CEA_DB_EXTENDED_TAG && +cea_db_payload_len (db) >=1 && + db->data[0 ] == tag); +}
nit: not a huge fan of the redundant parens in all of these
drivers/gpu/drm/drm_edid.c static const void *cea_db_data(const struct cea_db *db) · line 4317
Quoted 2 lines
drivers/gpu/drm/drm_edid.c +2
-0+ +static bool cea_db_is_vendor (const struct cea_db *db,int vendor_oui)
I'd probably make the tag/oui unsigned.
Quoted 135 lines
drivers/gpu/drm/drm_edid.c +29
-70+{ +const u8 *data =cea_db_data (db); + +return (cea_db_tag (db) ==CEA_DB_VENDOR && +cea_db_payload_len (db) >=3 && +oui (data[2 ], data[1 ], data[0 ]) == vendor_oui); +} +static void cea_db_iter_edid_begin (const struct edid *edid,struct cea_db_iter *iter) {memset (iter,0 ,sizeof (*iter));@@ -4443,79 +4453,44 @@ static void cea_db_iter_end(struct cea_db_iter *iter)memset (iter,0 ,sizeof (*iter)); } -static bool cea_db_is_hdmi_vsdb (const u8 *db) +static bool cea_db_is_hdmi_vsdb (const void *db) { -if (cea_db_tag (db) !=CEA_DB_VENDOR ) -return false; - -if (cea_db_payload_len (db) <5 ) -return false; - -return oui (db[3 ], db[2 ], db[1 ]) ==HDMI_IEEE_OUI ; +return (cea_db_is_vendor (db,HDMI_IEEE_OUI ) && +cea_db_payload_len (db) >=5 ); } -static bool cea_db_is_hdmi_forum_vsdb (const u8 *db) +static bool cea_db_is_hdmi_forum_vsdb (const void *db) { -if (cea_db_tag (db) !=CEA_DB_VENDOR ) -return false; - -if (cea_db_payload_len (db) <7 ) -return false; - -return oui (db[3 ], db[2 ], db[1 ]) ==HDMI_FORUM_IEEE_OUI ; +return (cea_db_is_vendor (db,HDMI_FORUM_IEEE_OUI ) && +cea_db_payload_len (db) >=7 ); } -static bool cea_db_is_microsoft_vsdb (const u8 *db) +static bool cea_db_is_microsoft_vsdb (const void *db) { -if (cea_db_tag (db) !=CEA_DB_VENDOR ) -return false; - -if (cea_db_payload_len (db) !=21 ) -return false; - -return oui (db[3 ], db[2 ], db[1 ]) ==MICROSOFT_IEEE_OUI ; +return (cea_db_is_vendor (db,MICROSOFT_IEEE_OUI ) && +cea_db_payload_len (db) ==21 ); } -static bool cea_db_is_vcdb (const u8 *db) +static bool cea_db_is_vcdb (const void *db) { -if (cea_db_tag (db) !=CEA_DB_EXTENDED_TAG ) -return false; - -if (cea_db_payload_len (db) !=2 ) -return false; - -if (cea_db_extended_tag (db) !=CEA_EXT_DB_VIDEO_CAP ) -return false; - -return true; +return (cea_db_is_extended_tag (db,CEA_EXT_DB_VIDEO_CAP ) && +cea_db_payload_len (db) ==2 ); } -static bool cea_db_is_y420cmdb (const u8 *db) +static bool cea_db_is_y420cmdb (const void *db) { -if (cea_db_tag (db) !=CEA_DB_EXTENDED_TAG ) -return false; - -if (!cea_db_payload_len (db)) -return false; - -if (cea_db_extended_tag (db) !=CEA_EXT_DB_420_VIDEO_CAP_MAP ) -return false; - -return true; +return cea_db_is_extended_tag (db,CEA_EXT_DB_420_VIDEO_CAP_MAP ); } -static bool cea_db_is_y420vdb (const u8 *db) +static bool cea_db_is_y420vdb (const void *db) { -if (cea_db_tag (db) !=CEA_DB_EXTENDED_TAG ) -return false; - -if (!cea_db_payload_len (db)) -return false; - -if (cea_db_extended_tag (db) !=CEA_EXT_DB_420_VIDEO_DATA ) -return false; +return cea_db_is_extended_tag (db,CEA_EXT_DB_420_VIDEO_DATA ); +} -return true; +static bool cea_db_is_hdmi_hdr_metadata_block (const void *db) +{ +return (cea_db_is_extended_tag (db,CEA_EXT_DB_HDR_STATIC_METADATA ) && +cea_db_payload_len (db) >=3 ); }#define for_each_cea_db (cea, i, start, end) \@@ -4651,20 +4626,6 @@ static void fixup_detailed_cea_mode_clock(struct drm_display_mode *mode) mode->clock = clock; } -static bool cea_db_is_hdmi_hdr_metadata_block (const u8 *db) -{ -if (cea_db_tag (db) !=CEA_DB_EXTENDED_TAG ) -return false; - -if (db[1 ] !=CEA_EXT_DB_HDR_STATIC_METADATA ) -return false; - -if (cea_db_payload_len (db) <3 ) -return false; - -return true; -} -static uint8_t eotf_supported (const u8 *edid_ext) { return edid_ext[2] &Signature · 1 line
2.30.2
Signature · 2 lines
Ville Syrjälä Intel
Re: [Intel-gfx] [RFC 06/19] drm/edid: clean up cea_db_is_*() functions
Quoted 33 lines · Ville Syrjälä
Quoted 32 lines · Jani Nikula
Abstract helpers for matching vendor data blocks and extended tags, and use them to simplify all the cea_db_is_*() functions.
Take void pointer as parameter to allow transitional use for both u8 * and struct
cea_db*.Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/drm_edid.c | 113 ++++++++++++------------------------- 1 file changed, 37 insertions(+), 76 deletions(-)drivers/gpu/drm/drm_edid.c +0
-6@@ -4196,12 +4196,6 @@ do_hdmi_vsdb_modes(struct drm_connector *connector, const u8 *db, u8 len,return modes; } -static int -cea_db_extended_tag (const u8 *db) -{ -return db[1 ]; -} -static int cea_revision (const u8 *cea) {@@ -4313,6 +4307,22 @@ static const void *cea_db_data(const struct cea_db *db)return db->data; }
Quoted 8 lines
drivers/gpu/drm/drm_edid.c static const void *cea_db_data(const struct cea_db *db) · line 4315
Quoted 6 lines
drivers/gpu/drm/drm_edid.c +6
-0+static bool cea_db_is_extended_tag (const struct cea_db *db,int tag) +{ +return (cea_db_tag (db) ==CEA_DB_EXTENDED_TAG && +cea_db_payload_len (db) >=1 && + db->data[0 ] == tag); +}nit: not a huge fan of the redundant parens in all of these
I guess that's something I've picked up from Python, makes the subsequent lines align nicely. Otherwise it's less pretty.
Quoted 5 lines
drivers/gpu/drm/drm_edid.c static const void *cea_db_data(const struct cea_db *db) · line 4317
Quoted 3 lines
drivers/gpu/drm/drm_edid.c +2
-0+ +static bool cea_db_is_vendor (const struct cea_db *db,int vendor_oui)I'd probably make the tag/oui unsigned.
Only chose int because the oui() function returns an int; maybe that should eventually be turned into unsigned int.
Quoted 138 lines
Reviewed-by Ville Syrjälä <[email protected]>Quoted 135 lines
drivers/gpu/drm/drm_edid.c +29
-70+{ +const u8 *data =cea_db_data (db); + +return (cea_db_tag (db) ==CEA_DB_VENDOR && +cea_db_payload_len (db) >=3 && +oui (data[2 ], data[1 ], data[0 ]) == vendor_oui); +} +static void cea_db_iter_edid_begin (const struct edid *edid,struct cea_db_iter *iter) {memset (iter,0 ,sizeof (*iter));@@ -4443,79 +4453,44 @@ static void cea_db_iter_end(struct cea_db_iter *iter)memset (iter,0 ,sizeof (*iter)); } -static bool cea_db_is_hdmi_vsdb (const u8 *db) +static bool cea_db_is_hdmi_vsdb (const void *db) { -if (cea_db_tag (db) !=CEA_DB_VENDOR ) -return false; - -if (cea_db_payload_len (db) <5 ) -return false; - -return oui (db[3 ], db[2 ], db[1 ]) ==HDMI_IEEE_OUI ; +return (cea_db_is_vendor (db,HDMI_IEEE_OUI ) && +cea_db_payload_len (db) >=5 ); } -static bool cea_db_is_hdmi_forum_vsdb (const u8 *db) +static bool cea_db_is_hdmi_forum_vsdb (const void *db) { -if (cea_db_tag (db) !=CEA_DB_VENDOR ) -return false; - -if (cea_db_payload_len (db) <7 ) -return false; - -return oui (db[3 ], db[2 ], db[1 ]) ==HDMI_FORUM_IEEE_OUI ; +return (cea_db_is_vendor (db,HDMI_FORUM_IEEE_OUI ) && +cea_db_payload_len (db) >=7 ); } -static bool cea_db_is_microsoft_vsdb (const u8 *db) +static bool cea_db_is_microsoft_vsdb (const void *db) { -if (cea_db_tag (db) !=CEA_DB_VENDOR ) -return false; - -if (cea_db_payload_len (db) !=21 ) -return false; - -return oui (db[3 ], db[2 ], db[1 ]) ==MICROSOFT_IEEE_OUI ; +return (cea_db_is_vendor (db,MICROSOFT_IEEE_OUI ) && +cea_db_payload_len (db) ==21 ); } -static bool cea_db_is_vcdb (const u8 *db) +static bool cea_db_is_vcdb (const void *db) { -if (cea_db_tag (db) !=CEA_DB_EXTENDED_TAG ) -return false; - -if (cea_db_payload_len (db) !=2 ) -return false; - -if (cea_db_extended_tag (db) !=CEA_EXT_DB_VIDEO_CAP ) -return false; - -return true; +return (cea_db_is_extended_tag (db,CEA_EXT_DB_VIDEO_CAP ) && +cea_db_payload_len (db) ==2 ); } -static bool cea_db_is_y420cmdb (const u8 *db) +static bool cea_db_is_y420cmdb (const void *db) { -if (cea_db_tag (db) !=CEA_DB_EXTENDED_TAG ) -return false; - -if (!cea_db_payload_len (db)) -return false; - -if (cea_db_extended_tag (db) !=CEA_EXT_DB_420_VIDEO_CAP_MAP ) -return false; - -return true; +return cea_db_is_extended_tag (db,CEA_EXT_DB_420_VIDEO_CAP_MAP ); } -static bool cea_db_is_y420vdb (const u8 *db) +static bool cea_db_is_y420vdb (const void *db) { -if (cea_db_tag (db) !=CEA_DB_EXTENDED_TAG ) -return false; - -if (!cea_db_payload_len (db)) -return false; - -if (cea_db_extended_tag (db) !=CEA_EXT_DB_420_VIDEO_DATA ) -return false; +return cea_db_is_extended_tag (db,CEA_EXT_DB_420_VIDEO_DATA ); +} -return true; +static bool cea_db_is_hdmi_hdr_metadata_block (const void *db) +{ +return (cea_db_is_extended_tag (db,CEA_EXT_DB_HDR_STATIC_METADATA ) && +cea_db_payload_len (db) >=3 ); }#define for_each_cea_db (cea, i, start, end) \@@ -4651,20 +4626,6 @@ static void fixup_detailed_cea_mode_clock(struct drm_display_mode *mode) mode->clock = clock; } -static bool cea_db_is_hdmi_hdr_metadata_block (const u8 *db) -{ -if (cea_db_tag (db) !=CEA_DB_EXTENDED_TAG ) -return false; - -if (db[1 ] !=CEA_EXT_DB_HDR_STATIC_METADATA ) -return false; - -if (cea_db_payload_len (db) <3 ) -return false; - -return true; -} -static uint8_t eotf_supported (const u8 *edid_ext) { return edid_ext[2] &Signature · 1 line
2.30.2
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
RFC 7/19 drm/edid: convert add_cea_modes() to use cea db iter
In reply to Jani NikulaIterate through all CEA EDID extension blocks and DisplayID CTA data blocks to add CEA modes.
--- drivers/gpu/drm/drm_edid.c | 67 ++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 36 deletions(-)
drivers/gpu/drm/drm_edid.c +31 -36
@@ -4539,46 +4539,41 @@ static void drm_parse_y420cmdb_bitmap(struct drm_connector *connector,static int add_cea_modes (struct drm_connector *connector,struct edid *edid) { -const u8 *cea =drm_find_cea_extension (edid); -const u8 *db, *hdmi =NULL , *video =NULL ; -u8 dbl, hdmi_len, video_len =0 ; +const struct cea_db *db; +struct cea_db_iter iter;int modes =0 ; -if (cea &&cea_revision (cea) >=3 ) { -int i, start, end; - -if (cea_db_offsets (cea, &start, &end)) -return 0 ; - -for_each_cea_db (cea, i, start, end) { - db = &cea[i]; - dbl =cea_db_payload_len (db); - -if (cea_db_tag (db) ==CEA_DB_VIDEO ) { - video = db +1 ; - video_len = dbl; - modes +=do_cea_modes (connector, video, dbl); - }else if (cea_db_is_hdmi_vsdb (db)) { - hdmi = db; - hdmi_len = dbl; - }else if (cea_db_is_y420vdb (db)) { -const u8 *vdb420 = &db[2 ]; - -/* Add 4:2:0(only) modes present in EDID */ - modes +=do_y420vdb_modes (connector, - vdb420, - dbl -1 ); - } +cea_db_iter_edid_begin (edid, &iter); +cea_db_iter_for_each (db, &iter) { +const u8 *hdmi =NULL , *video =NULL ; +u8 hdmi_len =0 , video_len =0 ; + +if (cea_db_tag (db) ==CEA_DB_VIDEO ) { + video =cea_db_data (db); + video_len =cea_db_payload_len (db); + modes +=do_cea_modes (connector, video, video_len); + }else if (cea_db_is_hdmi_vsdb (db)) { +/* FIXME: Switch to use cea_db_data() */ + hdmi = (const u8 *)db; + hdmi_len =cea_db_payload_len (db); + }else if (cea_db_is_y420vdb (db)) { +const u8 *vdb420 =cea_db_data (db) +1 ; + +/* Add 4:2:0(only) modes present in EDID */ + modes +=do_y420vdb_modes (connector, vdb420, +cea_db_payload_len (db) -1 ); } - } -/* -* We parse the HDMI VSDB after having added the cea modes as we will -* be patching their flags when the sink supports stereo 3D. -*/ -if (hdmi) - modes +=do_hdmi_vsdb_modes (connector, hdmi, hdmi_len, video, - video_len); +/* +* We parse the HDMI VSDB after having added the cea modes as we +* will be patching their flags when the sink supports stereo +* 3D. +*/ +if (hdmi) + modes +=do_hdmi_vsdb_modes (connector, hdmi, hdmi_len, + video, video_len); + } +cea_db_iter_end (&iter);return modes; }
Signature · 1 line
2.30.2
RFC 8/19 drm/edid: convert drm_edid_to_speaker_allocation() to use cea db iter
In reply to Jani NikulaUse the cea db iterator for speaker allocation. We'll still stop at the first speaker data block, but not at the first CEA extension if that doesn't have the info.
--- drivers/gpu/drm/drm_edid.c | 47 ++++++++++++-------------------------- 1 file changed, 15 insertions(+), 32 deletions(-)
drivers/gpu/drm/drm_edid.c +15 -32
@@ -4916,42 +4916,25 @@ EXPORT_SYMBOL(drm_edid_to_sad);*/ int drm_edid_to_speaker_allocation (struct edid *edid,u8 **sadb) { +const struct cea_db *db; +struct cea_db_iter iter;int count =0 ; -int i, start, end, dbl; -const u8 *cea; - cea =drm_find_cea_extension (edid); -if (!cea) { -DRM_DEBUG_KMS ("SAD: no CEA Extension found\n" ); -return 0 ; - } - -if (cea_revision (cea) <3 ) { -DRM_DEBUG_KMS ("SAD: wrong CEA revision\n" ); -return 0 ; - } - -if (cea_db_offsets (cea, &start, &end)) { -DRM_DEBUG_KMS ("SAD: invalid data block offsets\n" ); -return -EPROTO ; - } - -for_each_cea_db (cea, i, start, end) { -const u8 *db = &cea[i]; - -if (cea_db_tag (db) ==CEA_DB_SPEAKER ) { - dbl =cea_db_payload_len (db); - -/* Speaker Allocation Data Block */ -if (dbl ==3 ) { - *sadb =kmemdup (&db[1 ], dbl,GFP_KERNEL ); -if (!*sadb) -return -ENOMEM ; - count = dbl; -break ; - } +cea_db_iter_edid_begin (edid, &iter); +cea_db_iter_for_each (db, &iter) { +if (cea_db_tag (db) ==CEA_DB_SPEAKER && +cea_db_payload_len (db) ==3 ) { + *sadb =kmemdup (db->data,cea_db_payload_len (db), +GFP_KERNEL ); +if (!*sadb) +return -ENOMEM ; + count =cea_db_payload_len (db); +break ; } } +cea_db_iter_end (&iter); + +DRM_DEBUG_KMS ("Found %d Speaker Allocation Data Blocks\n" , count);return count; }
Signature · 1 line
2.30.2
RFC 9/19 drm/edid: convert drm_edid_to_sad() to use cea db iter
In reply to Jani NikulaUse the cea db iterator for short audio descriptors. We'll still stop at the first audio data block, but not at the first CEA extension if that doesn't have the info.
--- drivers/gpu/drm/drm_edid.c | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-)
drivers/gpu/drm/drm_edid.c +9 -25
@@ -4854,40 +4854,21 @@ static void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid)*/ int drm_edid_to_sad (struct edid *edid,struct cea_sad **sads) { +const struct cea_db *db; +struct cea_db_iter iter;int count =0 ; -int i, start, end, dbl; -const u8 *cea; - - cea =drm_find_cea_extension (edid); -if (!cea) { -DRM_DEBUG_KMS ("SAD: no CEA Extension found\n" ); -return 0 ; - } - -if (cea_revision (cea) <3 ) { -DRM_DEBUG_KMS ("SAD: wrong CEA revision\n" ); -return 0 ; - } - -if (cea_db_offsets (cea, &start, &end)) { -DRM_DEBUG_KMS ("SAD: invalid data block offsets\n" ); -return -EPROTO ; - } - -for_each_cea_db (cea, i, start, end) { -const u8 *db = &cea[i]; +cea_db_iter_edid_begin (edid, &iter); +cea_db_iter_for_each (db, &iter) {if (cea_db_tag (db) ==CEA_DB_AUDIO ) {int j; - dbl =cea_db_payload_len (db); - - count = dbl /3 ;/* SAD is 3B */ + count =cea_db_payload_len (db) /3 ;/* SAD is 3B */ *sads =kcalloc (count,sizeof (**sads),GFP_KERNEL );if (!*sads)return -ENOMEM ;for (j =0 ; j < count; j++) { -const u8 *sad = &db[1 + j *3 ]; +const u8 *sad = &db->data[j *3 ]; (*sads)[j].format = (sad[0 ] &0x78 ) >>3 ; (*sads)[j].channels = sad[0 ] &0x7 ;
@@ -4897,6 +4878,9 @@ int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads)break ; } } +cea_db_iter_end (&iter); + +DRM_DEBUG_KMS ("Found %d Short Audio Descriptors\n" , count);return count; }
Signature · 1 line
2.30.2
Re: [Intel-gfx] [RFC 09/19] drm/edid: convert drm_edid_to_sad() to use cea db iter
Quoted 3 lines · Jani Nikula
Use the cea db iterator for short audio descriptors. We'll still stop at the first audio data block, but not at the first CEA extension if that doesn't have the info.
This stuff should probably be converted over to the drm_edid_to_eld() approach which looks up all the SADs from the whole EDID. But that's something for amdgpu/radeon folks to think about since they're the only user.
Quoted 69 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/drm_edid.c | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-)drivers/gpu/drm/drm_edid.c +9
-25@@ -4854,40 +4854,21 @@ static void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid)*/ int drm_edid_to_sad (struct edid *edid,struct cea_sad **sads) { +const struct cea_db *db; +struct cea_db_iter iter;int count =0 ; -int i, start, end, dbl; -const u8 *cea; - - cea =drm_find_cea_extension (edid); -if (!cea) { -DRM_DEBUG_KMS ("SAD: no CEA Extension found\n" ); -return 0 ; - } - -if (cea_revision (cea) <3 ) { -DRM_DEBUG_KMS ("SAD: wrong CEA revision\n" ); -return 0 ; - } - -if (cea_db_offsets (cea, &start, &end)) { -DRM_DEBUG_KMS ("SAD: invalid data block offsets\n" ); -return -EPROTO ; - } - -for_each_cea_db (cea, i, start, end) { -const u8 *db = &cea[i]; +cea_db_iter_edid_begin (edid, &iter); +cea_db_iter_for_each (db, &iter) {if (cea_db_tag (db) ==CEA_DB_AUDIO ) {int j; - dbl =cea_db_payload_len (db); - - count = dbl /3 ;/* SAD is 3B */ + count =cea_db_payload_len (db) /3 ;/* SAD is 3B */ *sads =kcalloc (count,sizeof (**sads),GFP_KERNEL );if (!*sads)return -ENOMEM ;for (j =0 ; j < count; j++) { -const u8 *sad = &db[1 + j *3 ]; +const u8 *sad = &db->data[j *3 ]; (*sads)[j].format = (sad[0 ] &0x78 ) >>3 ; (*sads)[j].channels = sad[0 ] &0x7 ;@@ -4897,6 +4878,9 @@ int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads)break ; } } +cea_db_iter_end (&iter); + +DRM_DEBUG_KMS ("Found %d Short Audio Descriptors\n" , count);return count; }Signature · 1 line
2.30.2
Signature · 2 lines
Ville Syrjälä Intel
RFC 10/19 drm/edid: convert drm_detect_hdmi_monitor() to use cea db iter
In reply to Jani NikulaIterate through all CEA data blocks, not just the first CEA extension.
--- drivers/gpu/drm/drm_edid.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-)
drivers/gpu/drm/drm_edid.c +11 -14
@@ -4978,27 +4978,24 @@ EXPORT_SYMBOL(drm_av_sync_delay);*/ bool drm_detect_hdmi_monitor (struct edid *edid) { -const u8 *edid_ext; -int i; -int start_offset, end_offset; - - edid_ext =drm_find_cea_extension (edid); -if (!edid_ext) -return false; - -if (cea_db_offsets (edid_ext, &start_offset, &end_offset)) -return false; +const struct cea_db *db; +struct cea_db_iter iter; +bool hdmi = false;/* * Because HDMI identifier is in Vendor Specific Block, * search it from all data blocks of CEA extension. */ -for_each_cea_db (edid_ext, i, start_offset, end_offset) { -if (cea_db_is_hdmi_vsdb (&edid_ext[i])) -return true; +cea_db_iter_edid_begin (edid, &iter); +cea_db_iter_for_each (db, &iter) { +if (cea_db_is_hdmi_vsdb (db)) { + hdmi = true; +break ; + } } +cea_db_iter_end (&iter); -return false; +return hdmi; }EXPORT_SYMBOL (drm_detect_hdmi_monitor);
Signature · 1 line
2.30.2
RFC 11/19 drm/edid: convert drm_detect_monitor_audio() to use cea db iter
In reply to Jani NikulaIterate through all CEA data blocks.
--- drivers/gpu/drm/drm_edid.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)
drivers/gpu/drm/drm_edid.c +13 -10
@@ -5013,10 +5013,10 @@ EXPORT_SYMBOL(drm_detect_hdmi_monitor);*/ bool drm_detect_monitor_audio (struct edid *edid) { +const struct cea_db *db; +struct cea_db_iter iter;const u8 *edid_ext; -int i, j;bool has_audio = false; -int start_offset, end_offset; edid_ext =drm_find_cea_extension (edid);if (!edid_ext)
@@ -5029,18 +5029,21 @@ bool drm_detect_monitor_audio(struct edid *edid) goto end; } -if (cea_db_offsets (edid_ext, &start_offset, &end_offset)) - goto end; +cea_db_iter_edid_begin (edid, &iter); +cea_db_iter_for_each (db, &iter) { +if (cea_db_tag (db) ==CEA_DB_AUDIO ) { +const u8 *data =cea_db_data (db); +int i; -for_each_cea_db (edid_ext, i, start_offset, end_offset) { -if (cea_db_tag (&edid_ext[i]) ==CEA_DB_AUDIO ) { - has_audio = true; -for (j =1 ; j <cea_db_payload_len (&edid_ext[i]) +1 ; j +=3 ) +for (i =0 ; i <cea_db_payload_len (db); i +=3 )DRM_DEBUG_KMS ("CEA audio format %d\n" , - (edid_ext[i + j] >>3 ) &0xf ); - goto end; + (data[i] >>3 ) &0xf ); + has_audio = true; +break ; } } +cea_db_iter_end (&iter); + end:return has_audio; }
Signature · 1 line
2.30.2
RFC 12/19 drm/edid: convert drm_parse_cea_ext() to use cea db iter
In reply to Jani NikulaIterate through all CEA data blocks across all CEA extensions and DisplayID data blocks.
--- drivers/gpu/drm/drm_edid.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
drivers/gpu/drm/drm_edid.c +13 -12
@@ -5342,8 +5342,9 @@ static void drm_parse_cea_ext(struct drm_connector *connector, const struct edid *edid) {struct drm_display_info *info = &connector->display_info; +const struct cea_db *db; +struct cea_db_iter iter;const u8 *edid_ext; -int i, start, end; edid_ext =drm_find_cea_extension (edid);if (!edid_ext)
@@ -5358,25 +5359,25 @@ static void drm_parse_cea_ext(struct drm_connector *connector,if (edid_ext[3 ] &EDID_CEA_YCRCB422 ) info->color_formats |=DRM_COLOR_FORMAT_YCBCR422 ; -if (cea_db_offsets (edid_ext, &start, &end)) -return ; - -for_each_cea_db (edid_ext, i, start, end) { -const u8 *db = &edid_ext[i]; +cea_db_iter_edid_begin (edid, &iter); +cea_db_iter_for_each (db, &iter) { +/* FIXME: convert parsers to use struct cea_db */ +const u8 *data = (const u8 *)db;if (cea_db_is_hdmi_vsdb (db)) -drm_parse_hdmi_vsdb_video (connector, db); +drm_parse_hdmi_vsdb_video (connector, data);if (cea_db_is_hdmi_forum_vsdb (db)) -drm_parse_hdmi_forum_vsdb (connector, db); +drm_parse_hdmi_forum_vsdb (connector, data);if (cea_db_is_microsoft_vsdb (db)) -drm_parse_microsoft_vsdb (connector, db); +drm_parse_microsoft_vsdb (connector, data);if (cea_db_is_y420cmdb (db)) -drm_parse_y420cmdb_bitmap (connector, db); +drm_parse_y420cmdb_bitmap (connector, data);if (cea_db_is_vcdb (db)) -drm_parse_vcdb (connector, db); +drm_parse_vcdb (connector, data);if (cea_db_is_hdmi_hdr_metadata_block (db)) -drm_parse_hdr_metadata_block (connector, db); +drm_parse_hdr_metadata_block (connector, data); } +cea_db_iter_end (&iter); } static
Signature · 1 line
2.30.2
RFC 13/19 drm/edid: convert drm_edid_to_eld() to use cea db iter
In reply to Jani NikulaIterate through all CEA data blocks across all CEA extensions and DisplayID data blocks. This may gather more data than before, and if there's duplicated data, some is overwritten by whichever comes last.
--- drivers/gpu/drm/drm_edid.c | 64 +++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 35 deletions(-)
drivers/gpu/drm/drm_edid.c +29 -35
@@ -4758,12 +4758,12 @@ static void clear_eld(struct drm_connector *connector)*/ static void drm_edid_to_eld (struct drm_connector *connector,struct edid *edid) { +const struct cea_db *db; +struct cea_db_iter iter;uint8_t *eld = connector->eld;const u8 *cea; -const u8 *db;int total_sad_count =0 ;int mnl; -int dbl;clear_eld (connector);
@@ -4789,43 +4789,37 @@ static void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid) eld[DRM_ELD_PRODUCT_CODE0 ] = edid->prod_code[0 ]; eld[DRM_ELD_PRODUCT_CODE1 ] = edid->prod_code[1 ]; -if (cea_revision (cea) >=3 ) { -int i, start, end; +cea_db_iter_edid_begin (edid, &iter); +cea_db_iter_for_each (db, &iter) { +const u8 *data =cea_db_data (db); +int len =cea_db_payload_len (db);int sad_count; -if (cea_db_offsets (cea, &start, &end)) { - start =0 ; - end =0 ; - } - -for_each_cea_db (cea, i, start, end) { - db = &cea[i]; - dbl =cea_db_payload_len (db); - -switch (cea_db_tag (db)) { -case CEA_DB_AUDIO : -/* Audio Data Block, contains SADs */ - sad_count =min (dbl /3 ,15 - total_sad_count); -if (sad_count >=1 ) -memcpy (&eld[DRM_ELD_CEA_SAD (mnl, total_sad_count)], - &db[1 ], sad_count *3 ); - total_sad_count += sad_count; -break ; -case CEA_DB_SPEAKER : -/* Speaker Allocation Data Block */ -if (dbl >=1 ) - eld[DRM_ELD_SPEAKER ] = db[1 ]; -break ; -case CEA_DB_VENDOR : -/* HDMI Vendor-Specific Data Block */ -if (cea_db_is_hdmi_vsdb (db)) -drm_parse_hdmi_vsdb_audio (connector, db); -break ; -default : -break ; - } +switch (cea_db_tag (db)) { +case CEA_DB_AUDIO : +/* Audio Data Block, contains SADs */ + sad_count =min (len /3 ,15 - total_sad_count); +if (sad_count >=1 ) +memcpy (&eld[DRM_ELD_CEA_SAD (mnl, total_sad_count)], + data, sad_count *3 ); + total_sad_count += sad_count; +break ; +case CEA_DB_SPEAKER : +/* Speaker Allocation Data Block */ +if (len >=1 ) + eld[DRM_ELD_SPEAKER ] = data[0 ]; +break ; +case CEA_DB_VENDOR : +/* HDMI Vendor-Specific Data Block */ +if (cea_db_is_hdmi_vsdb (db)) +drm_parse_hdmi_vsdb_audio (connector, (const u8 *)db); +break ; +default : +break ; } } +cea_db_iter_end (&iter); + eld[DRM_ELD_SAD_COUNT_CONN_TYPE ] |= total_sad_count <<DRM_ELD_SAD_COUNT_SHIFT ; if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
Signature · 1 line
2.30.2
RFC 14/19 drm/edid: sunset the old unused cea data block iterators
In reply to Jani NikulaAll CEA data block iteration has now been converted to the new cea db iterators.
--- drivers/gpu/drm/drm_edid.c | 45 -------------------------------------- 1 file changed, 45 deletions(-)
drivers/gpu/drm/drm_edid.c +0 -45
@@ -4209,48 +4209,6 @@ cea_revision(const u8 *cea)return cea[1 ]; } -static int -cea_db_offsets (const u8 *cea,int *start,int *end) -{ -/* DisplayID CTA extension blocks and top-level CEA EDID -* block header definitions differ in the following bytes: -* 1) Byte 2 of the header specifies length differently, -* 2) Byte 3 is only present in the CEA top level block. -* -* The different definitions for byte 2 follow. -* -* DisplayID CTA extension block defines byte 2 as: -* Number of payload bytes -* -* CEA EDID block defines byte 2 as: -* Byte number (decimal) within this block where the 18-byte -* DTDs begin. If no non-DTD data is present in this extension -* block, the value should be set to 04h (the byte after next). -* If set to 00h, there are no DTDs present in this block and -* no non-DTD data. -*/ -if (cea[0 ] ==DATA_BLOCK_CTA ) { -/* -* for_each_displayid_db() has already verified -* that these stay within expected bounds. -*/ - *start =3 ; - *end = *start + cea[2 ]; - }else if (cea[0 ] ==CEA_EXT ) { -/* Data block offset in CEA extension block */ - *start =4 ; - *end = cea[2 ]; -if (*end ==0 ) - *end =127 ; -if (*end <4 || *end >127 ) -return -ERANGE ; - }else { -return -EOPNOTSUPP ; - } - -return 0 ; -} -/* * CEA Data Block iterator. *
@@ -4493,9 +4451,6 @@ static bool cea_db_is_hdmi_hdr_metadata_block(const void *db) cea_db_payload_len(db) >= 3); } -#define for_each_cea_db (cea, i, start, end) \ - for ((i) = (start); (i) < (end) && (i) + cea_db_payload_len(&(cea)[(i)]) < (end); (i) += cea_db_payload_len(&(cea)[(i)]) + 1) -static void drm_parse_y420cmdb_bitmap (struct drm_connector *connector,const u8 *db) {
Signature · 1 line
2.30.2
RFC 15/19 drm/edid: restore some type safety to cea_db_*() functions
In reply to Jani NikulaDuring the transition, we accepted a void pointer for a poor C programmer's version of polymorphism. Switch the functions to use struct cea_db * to regain some more type safety.
--- drivers/gpu/drm/drm_edid.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
drivers/gpu/drm/drm_edid.c +8 -11
@@ -4244,11 +4244,8 @@ struct cea_db {u8 data[]; } __packed; -static int cea_db_tag (const void *_db) +static int cea_db_tag (const struct cea_db *db) { -/* FIXME: Transition to passing struct cea_db * everywhere. */ -const struct cea_db *db = _db; -return db->tag_length >>5 ; }
@@ -4411,41 +4408,41 @@ static void cea_db_iter_end(struct cea_db_iter *iter)memset (iter,0 ,sizeof (*iter)); } -static bool cea_db_is_hdmi_vsdb (const void *db) +static bool cea_db_is_hdmi_vsdb (const struct cea_db *db) {return (cea_db_is_vendor (db,HDMI_IEEE_OUI ) &&cea_db_payload_len (db) >=5 ); } -static bool cea_db_is_hdmi_forum_vsdb (const void *db) +static bool cea_db_is_hdmi_forum_vsdb (const struct cea_db *db) {return (cea_db_is_vendor (db,HDMI_FORUM_IEEE_OUI ) &&cea_db_payload_len (db) >=7 ); } -static bool cea_db_is_microsoft_vsdb (const void *db) +static bool cea_db_is_microsoft_vsdb (const struct cea_db *db) {return (cea_db_is_vendor (db,MICROSOFT_IEEE_OUI ) &&cea_db_payload_len (db) ==21 ); } -static bool cea_db_is_vcdb (const void *db) +static bool cea_db_is_vcdb (const struct cea_db *db) {return (cea_db_is_extended_tag (db,CEA_EXT_DB_VIDEO_CAP ) &&cea_db_payload_len (db) ==2 ); } -static bool cea_db_is_y420cmdb (const void *db) +static bool cea_db_is_y420cmdb (const struct cea_db *db) {return cea_db_is_extended_tag (db,CEA_EXT_DB_420_VIDEO_CAP_MAP ); } -static bool cea_db_is_y420vdb (const void *db) +static bool cea_db_is_y420vdb (const struct cea_db *db) {return cea_db_is_extended_tag (db,CEA_EXT_DB_420_VIDEO_DATA ); } -static bool cea_db_is_hdmi_hdr_metadata_block (const void *db) +static bool cea_db_is_hdmi_hdr_metadata_block (const struct cea_db *db) {return (cea_db_is_extended_tag (db,CEA_EXT_DB_HDR_STATIC_METADATA ) &&cea_db_payload_len (db) >=3 );
Signature · 1 line
2.30.2
RFC 16/19 drm/edid: detect basic audio only on CEA extension
In reply to Jani NikulaThe CTA data block in DisplayID does not have the bits from byte 3 that a CEA extension has. Only look for them in CEA extensions, but also look for them in all CEA extensions.
References: https://patchwork.freedesktop.org/patch/msgid/[email protected]
--- drivers/gpu/drm/drm_edid.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/gpu/drm/drm_edid.c +11 -6
@@ -4959,16 +4959,21 @@ EXPORT_SYMBOL(drm_detect_hdmi_monitor);*/ bool drm_detect_monitor_audio (struct edid *edid) { +struct drm_edid_iter edid_iter;const struct cea_db *db;struct cea_db_iter iter; -const u8 *edid_ext; +const u8 *cea;bool has_audio = false; - edid_ext =drm_find_cea_extension (edid); -if (!edid_ext) - goto end; - - has_audio = ((edid_ext[3 ] &EDID_BASIC_AUDIO ) !=0 ); +drm_edid_iter_begin (edid, &edid_iter); +drm_edid_iter_for_each (cea, &edid_iter) { +if (cea[0 ] ==CEA_EXT ) { + has_audio = cea[3 ] &EDID_BASIC_AUDIO ; +if (has_audio) +break ; + } + } +drm_edid_iter_end (&edid_iter);if (has_audio) {DRM_DEBUG_KMS ("Monitor has basic audio support\n" );
Signature · 1 line
2.30.2
RFC 17/19 drm/edid: detect color formats and CEA revision only on CEA extension
In reply to Jani NikulaThe CTA data block in DisplayID does not have the bits from byte 3 that a CEA extension has. Only look for them in CEA extensions, but also look for them in all CEA extensions.
The DisplayID CTA data block version does not seem to match the CEA revision either. Ignore it for the purpose of CEA revision.
--- drivers/gpu/drm/drm_edid.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-)
drivers/gpu/drm/drm_edid.c +20 -11
@@ -5293,22 +5293,31 @@ static void drm_parse_cea_ext(struct drm_connector *connector, const struct edid *edid) {struct drm_display_info *info = &connector->display_info; +struct drm_edid_iter edid_iter;const struct cea_db *db;struct cea_db_iter iter; -const u8 *edid_ext; +const u8 *cea; - edid_ext =drm_find_cea_extension (edid); -if (!edid_ext) -return ; +drm_edid_iter_begin (edid, &edid_iter); +drm_edid_iter_for_each (cea, &edid_iter) { +if (cea[0 ] !=CEA_EXT ) +continue ; - info->cea_rev = edid_ext[1 ]; +if (!info->cea_rev) + info->cea_rev = cea[1 ]; -/* The existence of a CEA block should imply RGB support */ - info->color_formats =DRM_COLOR_FORMAT_RGB444 ; -if (edid_ext[3 ] &EDID_CEA_YCRCB444 ) - info->color_formats |=DRM_COLOR_FORMAT_YCBCR444 ; -if (edid_ext[3 ] &EDID_CEA_YCRCB422 ) - info->color_formats |=DRM_COLOR_FORMAT_YCBCR422 ; +if (info->cea_rev != cea[1 ]) +DRM_DEBUG_KMS ("CEA extension version mismatch %u != %u\n" , + info->cea_rev, cea[1 ]); + +/* The existence of a CEA block should imply RGB support */ + info->color_formats =DRM_COLOR_FORMAT_RGB444 ; +if (cea[3 ] &EDID_CEA_YCRCB444 ) + info->color_formats |=DRM_COLOR_FORMAT_YCBCR444 ; +if (cea[3 ] &EDID_CEA_YCRCB422 ) + info->color_formats |=DRM_COLOR_FORMAT_YCBCR422 ; + } +drm_edid_iter_end (&edid_iter);cea_db_iter_edid_begin (edid, &iter);cea_db_iter_for_each (db, &iter) {
Signature · 1 line
2.30.2
RFC 18/19 drm/edid: skip CEA extension scan in drm_edid_to_eld() just for CEA rev
In reply to Jani NikulaThe DisplayID CTA data block version does not necessarily match the CEA revision. Simplify by postponing drm_edid_to_eld() slightly, and reusing the CEA revision extracted by drm_parse_cea_ext().
By not bailing out early in drm_edid_to_eld() we may end up filling meaningless data to the ELD. However, the main decision for audio is not the ELD, but rather drm_detect_monitor_audio() called by drivers.
(Arguably a future cleanup could do that in drm_add_edid_modes() and cache the result in the connector.)
--- drivers/gpu/drm/drm_edid.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/gpu/drm/drm_edid.c +5 -10
@@ -4710,10 +4710,10 @@ static void clear_eld(struct drm_connector *connector)*/ static void drm_edid_to_eld (struct drm_connector *connector,struct edid *edid) { +struct drm_display_info *info = &connector->display_info;const struct cea_db *db;struct cea_db_iter iter;uint8_t *eld = connector->eld; -const u8 *cea;int total_sad_count =0 ;int mnl;
@@ -4722,16 +4722,10 @@ static void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid)if (!edid)return ; - cea =drm_find_cea_extension (edid); -if (!cea) { -DRM_DEBUG_KMS ("ELD: no CEA Extension found\n" ); -return ; - } - mnl =get_monitor_name (edid, &eld[DRM_ELD_MONITOR_NAME_STRING ]);DRM_DEBUG_KMS ("ELD monitor %s\n" , &eld[DRM_ELD_MONITOR_NAME_STRING ]); - eld[DRM_ELD_CEA_EDID_VER_MNL ] = cea[1 ] <<DRM_ELD_CEA_EDID_VER_SHIFT ; + eld[DRM_ELD_CEA_EDID_VER_MNL ] = info->cea_rev <<DRM_ELD_CEA_EDID_VER_SHIFT ; eld[DRM_ELD_CEA_EDID_VER_MNL ] |= mnl; eld[DRM_ELD_VER ] =DRM_ELD_VER_CEA861D ;
@@ -5681,8 +5675,6 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)return 0 ; } -drm_edid_to_eld (connector, edid); -/* * CEA-861-F adds ycbcr capability map block, for HDMI 2.0 sinks. * To avoid multiple parsing of same block, lets parse that map
@@ -5690,6 +5682,9 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)*/ quirks =drm_add_display_info (connector, edid); +/* Depends on info->cea_rev set by drm_add_display_info() above */ +drm_edid_to_eld (connector, edid); +/* * EDID spec says modes should be preferred in this order: * - preferred detailed mode
Signature · 1 line
2.30.2
RFC 19/19 drm/edid: sunset drm_find_cea_extension()
In reply to Jani NikulaConvert drm_find_cea_extension() to a predicate function to check if the EDID has a CEA extension or a DisplayID CTA data block. This is mainly to avoid adding new users that only find the first CEA extension.
--- drivers/gpu/drm/drm_edid.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
drivers/gpu/drm/drm_edid.c +8 -9
@@ -3422,30 +3422,29 @@ const u8 *drm_find_edid_extension(const struct edid *edid,return edid_ext; } -static const u8 *drm_find_cea_extension (const struct edid *edid) +/* Return true if the EDID has a CEA extension or a DisplayID CTA data block */ +static bool drm_edid_has_cea_extension (const struct edid *edid) {const struct displayid_block *block;struct displayid_iter iter; -const u8 *cea;int ext_index =0 ; +bool found = false;/* Look for a top level CEA extension block */ -/* FIXME: make callers iterate through multiple CEA ext blocks? */ - cea =drm_find_edid_extension (edid,CEA_EXT , &ext_index); -if (cea) -return cea; +if (drm_find_edid_extension (edid,CEA_EXT , &ext_index)) +return true;/* CEA blocks can also be found embedded in a DisplayID block */ displayid_iter_edid_begin (edid, &iter);displayid_iter_for_each (block, &iter) {if (block->tag ==DATA_BLOCK_CTA ) { - cea = (const u8 *)block; + found = true;break ; } }displayid_iter_end (&iter); -return cea; +return found; } static __always_inline const struct drm_display_mode *cea_mode_for_vic(u8 vic)
@@ -3715,7 +3714,7 @@ add_alternate_cea_modes(struct drm_connector *connector, struct edid *edid)int modes =0 ;/* Don't add CEA modes if the CEA extension block is missing */ -if (!drm_find_cea_extension (edid)) +if (!drm_edid_has_cea_extension (edid))return 0 ;/*
Signature · 1 line
2.30.2
Re: [RFC 19/19] drm/edid: sunset drm_find_cea_extension()
Quoted 52 lines · Jani Nikula
Convert
drm_find_cea_extension()to a predicate function to check if the EDID has a CEA extension or a DisplayID CTA data block. This is mainly to avoid adding new users that only find the first CEA extension.Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/drm_edid.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)drivers/gpu/drm/drm_edid.c +7
-8@@ -3422,30 +3422,29 @@ const u8 *drm_find_edid_extension(const struct edid *edid,return edid_ext; } -static const u8 *drm_find_cea_extension (const struct edid *edid) +/* Return true if the EDID has a CEA extension or a DisplayID CTA data block */ +static bool drm_edid_has_cea_extension (const struct edid *edid) {const struct displayid_block *block;struct displayid_iter iter; -const u8 *cea;int ext_index =0 ; +bool found = false;/* Look for a top level CEA extension block */ -/* FIXME: make callers iterate through multiple CEA ext blocks? */ - cea =drm_find_edid_extension (edid,CEA_EXT , &ext_index); -if (cea) -return cea; +if (drm_find_edid_extension (edid,CEA_EXT , &ext_index)) +return true;/* CEA blocks can also be found embedded in a DisplayID block */ displayid_iter_edid_begin (edid, &iter);displayid_iter_for_each (block, &iter) {if (block->tag ==DATA_BLOCK_CTA ) { - cea = (const u8 *)block; + found = true;break ; } }displayid_iter_end (&iter); -return cea; +return found; } static __always_inline const struct drm_display_mode *cea_mode_for_vic(u8 vic)
drivers/gpu/drm/drm_edid.c add_alternate_cea_modes(struct drm_connector *connector, struct edid *edid) · line 3717
Quoted 5 lines
drivers/gpu/drm/drm_edid.c +1
-1@@ -3715,7 +3714,7 @@ add_alternate_cea_modes(struct drm_connector *connector, struct edid *edid)int modes =0 ;/* Don't add CEA modes if the CEA extension block is missing */ -if (!drm_find_cea_extension (edid)) +if (!drm_edid_has_cea_extension (edid))
I'm thinking we could just do
if (modes)
modes += add_alternate_cea_modes(...);
at the end of add_cea_modes().
Or perhaps
if (found)
modes += add_alternate_cea_modes(...);
if we think that adding the alternate modes would be apporpriate even when add_cea_modes() didn't add anything. Not sure.
Yes, that would still introduce a sligth change in behaviour in case we have a CEA ext block/DisplayID CTA block without any of the video/hdmi/y420vdb blocks, but that edge case doesn't feel like a deal-breaker to me.
Signature · 2 lines
Ville Syrjälä Intel
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/edid: overhaul CEA data block iteration
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/edid: overhaul CEA data block iteration
URL : https://patchwork.freedesktop.org/series/101659/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip a1fd8fea9724 drm/edid: add drm_edid_extension_block_count() and drm_edid_size() a04b9a47ee0e drm: use drm_edid_extension_block_count() and drm_edid_size() -:75: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "!edid" #75: FILE: drivers/gpu/drm/drm_edid.c:3356: + if (edid == NULL || drm_edid_extension_block_count(edid) == 0)
total: 0 errors, 0 warnings, 1 checks, 63 lines checkeda946b4b8093f drm/edid: clean up CEA data block tag definitions 0d0acb1b0708 drm/edid: add iterator for EDID base and extension blocks -:56: ERROR:COMPLEX_MACRO: Macros with complex values should be enclosed in parentheses #56: FILE: drivers/gpu/drm/drm_edid.c:3389:
+#define drm_edid_iter_for_each(__block, __iter) \
+ while (((__block) = __drm_edid_iter_next(__iter)))
total: 1 errors, 0 warnings, 0 checks, 52 lines checked4c530a148bfe drm/edid: add iterator for CEA data blocks
-:219: ERROR:COMPLEX_MACRO: Macros with complex values should be enclosed in parentheses #219: FILE: drivers/gpu/drm/drm_edid.c:4435:
+#define cea_db_iter_for_each(__db, __iter) \
+ while (((__db) = __cea_db_iter_next(__iter)))
total: 1 errors, 0 warnings, 0 checks, 216 lines checked8f74ddc1652a drm/edid: clean up cea_db_is_*() functionsdb6dc8dd41fb drm/edid: convert add_cea_modes() to use cea db iterd7bef300e712 drm/edid: convert drm_edid_to_speaker_allocation() to use cea db iter 1d63449f0022 drm/edid: convert drm_edid_to_sad() to use cea db iter22a1b23994a7 drm/edid: convert drm_detect_hdmi_monitor() to use cea db iterffdd375908fd drm/edid: convert drm_detect_monitor_audio() to use cea db iterade266ca2a2d drm/edid: convert drm_parse_cea_ext() to use cea db iterbdf077ccb603 drm/edid: convert drm_edid_to_eld() to use cea db iter0ba046c15f17 drm/edid: sunset the old unused cea data block iteratorse3edc2173219 drm/edid: restore some type safety to cea_db_*() functions3fc75617d81c drm/edid: detect basic audio only on CEA extension
-:10: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #10:
References: https://patchwork.freedesktop.org/patch/msgid/[email protected]
total: 0 errors, 1 warnings, 0 checks, 27 lines checked6fa348a171ae drm/edid: detect color formats and CEA revision only on CEA extension 13cc175a8ee2 drm/edid: skip CEA extension scan in drm_edid_to_eld() just for CEA rev a6b8101aaa65 drm/edid: sunset drm_find_cea_extension()
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/edid: overhaul CEA data block iteration
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/edid: overhaul CEA data block iteration
URL : https://patchwork.freedesktop.org/series/101659/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip Sparse version: v0.6.2 Fast mode used, each commit won't be checked separately. - +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +./drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgv_sriovmsg.h:319:49: error: static assertion failed: "amd_sriov_msg_pf2vf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1444:25: error: incompatible types in comparison expression (different address spaces): +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1444:25: struct dma_fence * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1444:25: struct dma_fence [noderef] __rcu * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1445:17: error: incompatible types in comparison expression (different address spaces): +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1445:17: struct dma_fence * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1445:17: struct dma_fence [noderef] __rcu * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1504:17: error: incompatible types in comparison expression (different address spaces): +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1504:17: struct dma_fence * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1504:17: struct dma_fence [noderef] __rcu * +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:353:16: error: incompatible types in comparison expression (different type sizes): +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:353:16: unsigned long * +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:353:16: unsigned long long * +drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c:295:25: error: incompatible types in comparison expression (different address spaces): +drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c:295:25: struct dma_fence * +drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c:295:25: struct dma_fence [noderef] __rcu * +drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c:296:17: error: incompatible types in comparison expression (different address spaces): +drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c:296:17: struct dma_fence * +drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c:296:17: struct dma_fence [noderef] __rcu * +drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c:345:17: error: incompatible types in comparison expression (different address spaces): +drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c:345:17: struct dma_fence * +drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c:345:17: struct dma_fence [noderef] __rcu * +drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c:596:23: error: incompatible types in comparison expression (different address spaces): +drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c:596:23: struct dma_fence * +drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c:596:23: struct dma_fence [noderef] __rcu * +drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c:598:25: error: incompatible types in comparison expression (different address spaces): +drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c:598:25: struct dma_fence * +drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c:598:25: struct dma_fence [noderef] __rcu * +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf_info must be 1 KB" +drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h:315:49: error: static assertion failed: "amd_sriov_msg_vf2pf
Patchwork
CI[Intel-gfx] ✗ Fi.CI.DOCS: warning for drm/edid: overhaul CEA data block iteration
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/edid: overhaul CEA data block iteration
URL : https://patchwork.freedesktop.org/series/101659/
State : warning
== Summary ==
$ make htmldocs 2>&1 > /dev/null | grep i915 ./drivers/gpu/drm/i915/display/intel_drrs.c:1: warning: 'intel_drrs_enable' not found ./drivers/gpu/drm/i915/display/intel_drrs.c:1: warning: 'intel_drrs_disable' not found
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for drm/edid: overhaul CEA data block iteration
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/edid: overhaul CEA data block iteration
URL : https://patchwork.freedesktop.org/series/101659/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_11397 -> Patchwork_22648
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/index.html
Participating hosts (48 -> 40)
------------------------------
Missing (8): shard-tglu fi-hsw-4200u bat-adlm-1 fi-bsw-cyan fi-ctg-p8600 shard-rkl bat-jsl-2 fi-bdw-samus
Known issues
------------
Here are the changes found in Patchwork_22648 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@semaphore:
- fi-hsw-4770: NOTRUN -> [SKIP][1] ([fdo#109271] / [fdo#109315]) +17 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/fi-hsw-4770/igt@amdgpu/[email protected]
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-hsw-4770: [PASS][2] -> [SKIP][3] ([fdo#109271]) +2 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/fi-hsw-4770/igt@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/fi-hsw-4770/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s0@smem:
- fi-glk-dsi: [DMESG-WARN][4] ([i915#2943]) -> [PASS][5]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/fi-glk-dsi/igt@gem_exec_suspend@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/fi-glk-dsi/igt@gem_exec_suspend@[email protected]
* igt@i915_selftest@live@hangcheck:
- bat-dg1-6: [DMESG-FAIL][6] ([i915#4494] / [i915#4957]) -> [PASS][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/bat-dg1-6/igt@i915_selftest@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/bat-dg1-6/igt@i915_selftest@[email protected]
- fi-hsw-4770: [INCOMPLETE][8] ([i915#3303]) -> [PASS][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/fi-hsw-4770/igt@i915_selftest@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/fi-hsw-4770/igt@i915_selftest@[email protected]
* igt@kms_busy@basic@flip:
- {bat-adlp-6}: [DMESG-WARN][10] ([i915#3576]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/bat-adlp-6/igt@kms_busy@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/bat-adlp-6/igt@kms_busy@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886
[i915#2943]: https://gitlab.freedesktop.org/drm/intel/issues/2943
[i915#3303]: https://gitlab.freedesktop.org/drm/intel/issues/3303
[i915#3576]: https://gitlab.freedesktop.org/drm/intel/issues/3576
[i915#4391]: https://gitlab.freedesktop.org/drm/intel/issues/4391
[i915#4494]: https://gitlab.freedesktop.org/drm/intel/issues/4494
[i915#4957]: https://gitlab.freedesktop.org/drm/intel/issues/4957
[i915#5338]: https://gitlab.freedesktop.org/drm/intel/issues/5338
Build changes
-------------
* Linux: CI_DRM_11397 -> Patchwork_22648
CI-20190529: 20190529
CI_DRM_11397: 056d47eaf6ea753fa2e21da31f9cbd8b721bbb7b @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6387: 04d012b18355b53798af5a55a8915afb1a421bba @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_22648: a6b8101aaa65a5a20a66a7603f13e9173d9bcef5 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
a6b8101aaa65 drm/edid: sunset drm_find_cea_extension()13cc175a8ee2 drm/edid: skip CEA extension scan in drm_edid_to_eld() just for CEA rev 6fa348a171ae drm/edid: detect color formats and CEA revision only on CEA extension 3fc75617d81c drm/edid: detect basic audio only on CEA extension e3edc2173219 drm/edid: restore some type safety to cea_db_*() functions 0ba046c15f17 drm/edid: sunset the old unused cea data block iterators bdf077ccb603 drm/edid: convert drm_edid_to_eld() to use cea db iter ade266ca2a2d drm/edid: convert drm_parse_cea_ext() to use cea db iter ffdd375908fd drm/edid: convert drm_detect_monitor_audio() to use cea db iter 22a1b23994a7 drm/edid: convert drm_detect_hdmi_monitor() to use cea db iter 1d63449f0022 drm/edid: convert drm_edid_to_sad() to use cea db iter d7bef300e712 drm/edid: convert drm_edid_to_speaker_allocation() to use cea db iter db6dc8dd41fb drm/edid: convert add_cea_modes() to use cea db iter 8f74ddc1652a drm/edid: clean up cea_db_is_*() functions4c530a148bfe drm/edid: add iterator for CEA data blocks0d0acb1b0708 drm/edid: add iterator for EDID base and extension blocks a946b4b8093f drm/edid: clean up CEA data block tag definitions a04b9a47ee0e drm: use drm_edid_extension_block_count() and drm_edid_size() a1fd8fea9724 drm/edid: add drm_edid_extension_block_count() and drm_edid_size()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/index.html
Patchwork
CI[Intel-gfx] ✓ Fi.CI.IGT: success for drm/edid: overhaul CEA data block iteration
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/edid: overhaul CEA data block iteration
URL : https://patchwork.freedesktop.org/series/101659/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_11397_full -> Patchwork_22648_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Participating hosts (12 -> 12)
------------------------------
No changes in participating hosts
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_22648_full:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@gem_exec_fence@expired-history:
- {shard-rkl}: [PASS][1] -> [INCOMPLETE][2] +3 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-5/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-5/igt@[email protected]
* igt@syncobj_timeline@wait-all-for-submit-snapshot:
- {shard-rkl}: [PASS][3] -> [DMESG-WARN][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-6/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-5/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_22648_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_persistence@legacy-engines-hang@blt:
- shard-skl: NOTRUN -> [SKIP][5] ([fdo#109271]) +231 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-skl9/igt@gem_ctx_persistence@[email protected]
* igt@gem_eio@unwedge-stress:
- shard-iclb: [PASS][6] -> [TIMEOUT][7] ([i915#2481] / [i915#3070])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-iclb1/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-iclb4/igt@[email protected]
* igt@gem_exec_capture@pi@rcs0:
- shard-skl: [PASS][8] -> [INCOMPLETE][9] ([i915#4547])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-skl9/igt@gem_exec_capture@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-skl8/igt@gem_exec_capture@[email protected]
* igt@gem_exec_fair@basic-none@vcs0:
- shard-apl: [PASS][10] -> [FAIL][11] ([i915#2842])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-apl6/igt@gem_exec_fair@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-apl6/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace@vecs0:
- shard-glk: [PASS][12] -> [FAIL][13] ([i915#2842]) +2 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-glk4/igt@gem_exec_fair@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-glk5/igt@gem_exec_fair@[email protected]
- shard-iclb: [PASS][14] -> [FAIL][15] ([i915#2842])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-iclb7/igt@gem_exec_fair@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-iclb3/igt@gem_exec_fair@[email protected]
* igt@gem_huc_copy@huc-copy:
- shard-tglb: [PASS][16] -> [SKIP][17] ([i915#2190])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-tglb2/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-tglb6/igt@[email protected]
* igt@gem_lmem_swapping@parallel-random:
- shard-skl: NOTRUN -> [SKIP][18] ([fdo#109271] / [i915#4613]) +3 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-skl9/igt@[email protected]
* igt@gen9_exec_parse@allowed-all:
- shard-glk: [PASS][19] -> [DMESG-WARN][20] ([i915#1436] / [i915#716])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-glk8/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-glk5/igt@[email protected]
* igt@gen9_exec_parse@allowed-single:
- shard-skl: [PASS][21] -> [DMESG-WARN][22] ([i915#1436] / [i915#716])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-skl1/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-skl2/igt@[email protected]
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [PASS][23] -> [FAIL][24] ([i915#454])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-iclb1/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-iclb4/igt@[email protected]
* igt@kms_big_fb@4-tiled-16bpp-rotate-270:
- shard-iclb: NOTRUN -> [SKIP][25] ([i915#5286])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-iclb6/igt@[email protected]
* igt@kms_big_fb@4-tiled-max-hw-stride-32bpp-rotate-180:
- shard-tglb: NOTRUN -> [SKIP][26] ([i915#5286])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-tglb8/igt@[email protected]
* igt@kms_big_fb@linear-64bpp-rotate-90:
- shard-tglb: NOTRUN -> [SKIP][27] ([fdo#111614])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-tglb8/igt@[email protected]
* igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-async-flip:
- shard-skl: NOTRUN -> [FAIL][28] ([i915#3743]) +1 similar issue
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-skl10/igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-async-flip.html
* igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-0-hflip-async-flip:
- shard-skl: NOTRUN -> [SKIP][29] ([fdo#109271] / [i915#3777]) +2 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-skl9/igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-0-hflip-async-flip.html
* igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_mc_ccs:
- shard-skl: NOTRUN -> [SKIP][30] ([fdo#109271] / [i915#3886]) +10 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-skl4/igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_mc_ccs.html
- shard-tglb: NOTRUN -> [SKIP][31] ([i915#3689] / [i915#3886])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-tglb8/igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-b-crc-sprite-planes-basic-yf_tiled_ccs:
- shard-tglb: NOTRUN -> [SKIP][32] ([fdo#111615] / [i915#3689]) +1 similar issue
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-tglb8/igt@kms_ccs@pipe-b-crc-sprite-planes-basic-yf_tiled_ccs.html
* igt@kms_ccs@pipe-c-crc-primary-basic-y_tiled_gen12_mc_ccs:
- shard-kbl: NOTRUN -> [SKIP][33] ([fdo#109271] / [i915#3886])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-kbl7/igt@kms_ccs@pipe-c-crc-primary-basic-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-d-missing-ccs-buffer-y_tiled_ccs:
- shard-tglb: NOTRUN -> [SKIP][34] ([i915#3689])
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-tglb8/igt@kms_ccs@pipe-d-missing-ccs-buffer-y_tiled_ccs.html
* igt@kms_chamelium@dp-crc-multiple:
- shard-skl: NOTRUN -> [SKIP][35] ([fdo#109271] / [fdo#111827]) +16 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-skl6/igt@[email protected]
* igt@kms_chamelium@dp-hpd-after-suspend:
- shard-kbl: NOTRUN -> [SKIP][36] ([fdo#109271] / [fdo#111827])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-kbl7/igt@[email protected]
* igt@kms_color_chamelium@pipe-d-ctm-max:
- shard-tglb: NOTRUN -> [SKIP][37] ([fdo#109284] / [fdo#111827]) +2 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-tglb8/igt@[email protected]
* igt@kms_content_protection@uevent:
- shard-tglb: NOTRUN -> [SKIP][38] ([i915#1063])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-tglb8/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-32x32-random:
- shard-tglb: NOTRUN -> [SKIP][39] ([i915#3319])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-tglb8/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-512x512-offscreen:
- shard-tglb: NOTRUN -> [SKIP][40] ([fdo#109279] / [i915#3359])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-tglb8/igt@[email protected]
* igt@kms_cursor_legacy@cursorb-vs-flipb-atomic:
- shard-tglb: NOTRUN -> [SKIP][41] ([fdo#109274] / [fdo#111825]) +1 similar issue
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-tglb8/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-iclb: [PASS][42] -> [FAIL][43] ([i915#2346])
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-iclb7/igt@[email protected]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-iclb7/igt@[email protected]
* igt@kms_draw_crc@draw-method-xrgb8888-mmap-gtt-4tiled:
- shard-tglb: NOTRUN -> [SKIP][44] ([i915#5287])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-tglb8/igt@[email protected]
* igt@kms_flip@flip-vs-suspend@a-dp1:
- shard-apl: [PASS][45] -> [DMESG-WARN][46] ([i915#180]) +3 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-apl6/igt@kms_flip@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-apl6/igt@kms_flip@[email protected]
* igt@kms_flip@plain-flip-ts-check@c-edp1:
- shard-skl: [PASS][47] -> [FAIL][48] ([i915#2122]) +1 similar issue
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-skl7/igt@kms_flip@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-skl10/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-shrfb-plflip-blt:
- shard-tglb: NOTRUN -> [SKIP][49] ([fdo#109280] / [fdo#111825]) +3 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-tglb8/igt@[email protected]
* igt@kms_hdr@static-toggle-suspend:
- shard-tglb: NOTRUN -> [SKIP][50] ([i915#3555])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-tglb8/igt@[email protected]
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- shard-skl: NOTRUN -> [SKIP][51] ([fdo#109271] / [i915#533]) +1 similar issue
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-skl9/igt@[email protected]
- shard-kbl: NOTRUN -> [SKIP][52] ([fdo#109271] / [i915#533])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-kbl7/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: NOTRUN -> [FAIL][53] ([fdo#108145] / [i915#265]) +1 similar issue
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-skl10/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-alpha-transparent-fb:
- shard-skl: NOTRUN -> [FAIL][54] ([i915#265])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-skl9/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-d-constant-alpha-min:
- shard-kbl: NOTRUN -> [SKIP][55] ([fdo#109271]) +4 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-kbl7/igt@[email protected]
* igt@kms_plane_scaling@planes-unity-scaling-downscale-factor-0-5@pipe-a-edp-1-planes-upscale-downscale:
- shard-iclb: [PASS][56] -> [SKIP][57] ([i915#5235]) +2 similar issues
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-iclb5/igt@kms_plane_scaling@planes-unity-scaling-downscale-factor-0-5@pipe-a-edp-1-planes-upscale-downscale.html
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-iclb2/igt@kms_plane_scaling@planes-unity-scaling-downscale-factor-0-5@pipe-a-edp-1-planes-upscale-downscale.html
* igt@kms_psr2_su@frontbuffer-xrgb8888:
- shard-iclb: [PASS][58] -> [SKIP][59] ([fdo#109642] / [fdo#111068] / [i915#658])
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-iclb2/igt@[email protected]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-iclb7/igt@[email protected]
* igt@kms_psr2_su@page_flip-nv12:
- shard-tglb: NOTRUN -> [SKIP][60] ([i915#1911])
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-tglb8/igt@kms_psr2_su@page_flip-nv12.html
* igt@kms_psr2_su@page_flip-xrgb8888:
- shard-skl: NOTRUN -> [SKIP][61] ([fdo#109271] / [i915#658]) +2 similar issues
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-skl9/igt@kms_psr2_su@page_flip-xrgb8888.html
* igt@kms_psr@psr2_dpms:
- shard-iclb: [PASS][62] -> [SKIP][63] ([fdo#109441])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-iclb2/igt@kms_psr@psr2_dpms.html
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-iclb5/igt@kms_psr@psr2_dpms.html
* igt@kms_rotation_crc@primary-yf-tiled-reflect-x-90:
- shard-tglb: NOTRUN -> [SKIP][64] ([fdo#111615])
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-tglb8/igt@[email protected]
* igt@kms_vblank@pipe-a-query-forked:
- shard-snb: [PASS][65] -> [SKIP][66] ([fdo#109271]) +2 similar issues
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-snb5/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-snb7/igt@[email protected]
* igt@kms_writeback@writeback-pixel-formats:
- shard-skl: NOTRUN -> [SKIP][67] ([fdo#109271] / [i915#2437]) +1 similar issue
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-skl10/igt@[email protected]
* igt@prime_nv_api@nv_i915_import_twice_check_flink_name:
- shard-tglb: NOTRUN -> [SKIP][68] ([fdo#109291])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-tglb8/igt@prime_nv_api@nv_i915_import_twice_check_flink_name.html
* igt@sysfs_clients@fair-0:
- shard-skl: NOTRUN -> [SKIP][69] ([fdo#109271] / [i915#2994]) +2 similar issues
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-skl4/igt@[email protected]
- shard-tglb: NOTRUN -> [SKIP][70] ([i915#2994])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-tglb8/igt@[email protected]
#### Possible fixes ####
* igt@drm_import_export@flink:
- {shard-rkl}: [DMESG-WARN][71] ([i915#5041]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-5/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-4/igt@[email protected]
* igt@fbdev@nullptr:
- {shard-rkl}: [SKIP][73] ([i915#2582]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-5/igt@[email protected]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-6/igt@[email protected]
* igt@feature_discovery@psr2:
- shard-iclb: [SKIP][75] ([i915#658]) -> [PASS][76]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-iclb5/igt@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-iclb2/igt@[email protected]
* igt@gem_ctx_persistence@many-contexts:
- {shard-rkl}: [FAIL][77] ([i915#2410]) -> [PASS][78]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-5/igt@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-6/igt@[email protected]
* igt@gem_eio@unwedge-stress:
- {shard-rkl}: [TIMEOUT][79] ([i915#3063]) -> [PASS][80]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-6/igt@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-1/igt@[email protected]
* igt@gem_exec_balancer@parallel-balancer:
- shard-iclb: [SKIP][81] ([i915#4525]) -> [PASS][82]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-iclb5/igt@[email protected]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-iclb2/igt@[email protected]
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-apl: [SKIP][83] ([fdo#109271]) -> [PASS][84]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-apl2/igt@gem_exec_fair@[email protected]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-apl1/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-kbl: [FAIL][85] ([i915#2842]) -> [PASS][86] +1 similar issue
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-kbl6/igt@gem_exec_fair@[email protected]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-kbl6/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace-share@rcs0:
- {shard-rkl}: [FAIL][87] ([i915#2842]) -> [PASS][88]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-1/igt@gem_exec_fair@[email protected]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-5/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-kbl: [FAIL][89] ([i915#2851]) -> [PASS][90]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-kbl4/igt@gem_exec_fair@[email protected]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-kbl1/igt@gem_exec_fair@[email protected]
* igt@gem_exec_nop@basic-series:
- shard-glk: [DMESG-WARN][91] ([i915#118]) -> [PASS][92]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-glk3/igt@[email protected]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-glk1/igt@[email protected]
* igt@i915_pm_rpm@dpms-mode-unset-lpsp:
- {shard-rkl}: [SKIP][93] ([i915#1397]) -> [PASS][94]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-5/igt@[email protected]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-6/igt@[email protected]
* igt@i915_pm_rpm@i2c:
- {shard-rkl}: [SKIP][95] ([fdo#109308]) -> [PASS][96]
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-5/igt@[email protected]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-6/igt@[email protected]
* igt@i915_selftest@live@hangcheck:
- {shard-rkl}: [INCOMPLETE][97] ([i915#2373]) -> [PASS][98]
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-5/igt@i915_selftest@[email protected]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-6/igt@i915_selftest@[email protected]
* igt@kms_big_fb@x-tiled-32bpp-rotate-0:
- {shard-tglu}: [DMESG-WARN][99] ([i915#402]) -> [PASS][100]
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-tglu-5/igt@[email protected]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-tglu-3/igt@[email protected]
* igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs:
- {shard-rkl}: ([SKIP][101], [SKIP][102]) ([i915#1845] / [i915#4098]) -> [PASS][103]
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-4/igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs.html
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-5/igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs.html
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-6/igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs.html
* igt@kms_color@pipe-c-invalid-degamma-lut-sizes:
- {shard-rkl}: [SKIP][104] ([i915#4070]) -> [PASS][105] +1 similar issue
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-1/igt@[email protected]
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-5/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-128x42-random:
- {shard-rkl}: [SKIP][106] ([fdo#112022]) -> [PASS][107] +1 similar issue
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-4/igt@[email protected]
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-6/igt@[email protected]
* igt@kms_cursor_edge_walk@pipe-b-128x128-right-edge:
- {shard-rkl}: [SKIP][108] ([i915#1849] / [i915#4098]) -> [PASS][109] +2 similar issues
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-5/igt@[email protected]
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-6/igt@[email protected]
* igt@kms_cursor_legacy@cursor-vs-flip-toggle:
- {shard-rkl}: [SKIP][110] ([fdo#111825]) -> [PASS][111]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-5/igt@[email protected]
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-6/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-toggle:
- shard-iclb: [FAIL][112] ([i915#2346]) -> [PASS][113]
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-iclb7/igt@[email protected]
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-iclb3/igt@[email protected]
* igt@kms_draw_crc@draw-method-rgb565-pwrite-xtiled:
- {shard-rkl}: [SKIP][114] ([i915#4098] / [i915#4369]) -> [PASS][115]
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-4/igt@[email protected]
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-6/igt@[email protected]
* igt@kms_draw_crc@draw-method-xrgb2101010-blt-untiled:
- {shard-rkl}: ([SKIP][116], [SKIP][117]) ([fdo#111314] / [i915#4098] / [i915#4369]) -> [PASS][118]
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-5/igt@[email protected]
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-4/igt@[email protected]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-6/igt@[email protected]
* igt@kms_draw_crc@draw-method-xrgb2101010-mmap-gtt-xtiled:
- {shard-rkl}: [SKIP][119] ([fdo#111314] / [i915#4098] / [i915#4369]) -> [PASS][120] +4 similar issues
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-5/igt@[email protected]
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-6/igt@[email protected]
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile-downscaling:
- shard-iclb: [SKIP][121] ([i915#3701]) -> [PASS][122] +1 similar issue
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-iclb2/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile-downscaling.html
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-iclb5/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile-downscaling.html
* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytile-upscaling:
- {shard-rkl}: [INCOMPLETE][123] ([i915#3701]) -> [PASS][124]
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-5/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytile-upscaling.html
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-6/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytile-upscaling.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-blt:
- {shard-rkl}: ([SKIP][125], [SKIP][126]) ([i915#1849] / [i915#4098]) -> [PASS][127] +2 similar issues
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-5/igt@[email protected]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-4/igt@[email protected]
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-6/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-msflip-blt:
- {shard-rkl}: [SKIP][128] ([i915#4098]) -> [PASS][129]
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-4/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-msflip-blt.html
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-6/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-msflip-blt.html
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-gtt:
- {shard-rkl}: [SKIP][130] ([i915#1849]) -> [PASS][131] +6 similar issues
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-5/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-gtt.html
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-6/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-gtt.html
* igt@kms_invalid_mode@bad-htotal:
- {shard-rkl}: [SKIP][132] ([i915#4278]) -> [PASS][133] +1 similar issue
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-5/igt@[email protected]
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-6/igt@[email protected]
* igt@kms_plane_cursor@pipe-a-overlay-size-64:
- {shard-rkl}: [SKIP][134] ([i915#1845] / [i915#4098]) -> [PASS][135] +19 similar issues
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-5/igt@[email protected]
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-6/igt@[email protected]
* igt@kms_psr@dpms:
- {shard-rkl}: [SKIP][136] ([i915#1072]) -> [PASS][137]
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-5/igt@[email protected]
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-6/igt@[email protected]
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [SKIP][138] ([fdo#109441]) -> [PASS][139]
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-iclb5/igt@kms_psr@psr2_cursor_render.html
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
* igt@perf@polling-parameterized:
- {shard-rkl}: [FAIL][140] ([i915#1542]) -> [PASS][141]
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-rkl-1/igt@[email protected]
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-rkl-5/igt@[email protected]
* igt@perf@polling-small-buf:
- shard-skl: [FAIL][142] ([i915#1722]) -> [PASS][143]
[142]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-skl7/igt@[email protected]
[143]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-skl4/igt@[email protected]
* igt@sysfs_timeslice_duration@timeout@vecs0:
- shard-apl: [FAIL][144] ([i915#1755]) -> [PASS][145]
[144]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-apl2/igt@sysfs_timeslice_duration@[email protected]
[145]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-apl1/igt@sysfs_timeslice_duration@[email protected]
#### Warnings ####
* igt@gem_eio@unwedge-stress:
- shard-tglb: [FAIL][146] ([i915#232]) -> [TIMEOUT][147] ([i915#3063] / [i915#3648])
[146]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11397/shard-tglb3/igt@[email protected]
[147]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/shard-
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22648/index.html
Quoted 7 lines · Jani Nikula
Add iterators for EDID blocks and CEA data blocks, to iterate through all data blocks across all CEA extensions and CTA blocks in DisplayID data blocks. Fix all code assuming only one CEA extension. Fix code assuming CTA blocks contain everything that CEA extensions do. Sprinkle a bunch of cleanups on top.
This is completely UNTESTED, didn't even smoke test it. It builds. ;)
Despite that it's now
Left a few minor comments here and there.
Quoted 47 lines
This superseeds parts of [1] and [2].
BR,
Jani.[1] https://patchwork.freedesktop.org/series/101241/
[2] https://patchwork.freedesktop.org/patch/msgid/[email protected]Cc Shawn C Lee <[email protected]>Cc Cooper Chiou <[email protected]>Cc Drew Davenport <[email protected]>Jani Nikula (19):
drm/edid: adddrm_edid_extension_block_count()anddrm_edid_size()
drm: usedrm_edid_extension_block_count()anddrm_edid_size()drm/edid: clean up CEA data block tag definitions drm/edid: add iterator for EDID base and extension blocks drm/edid: add iterator for CEA data blocks
drm/edid: clean up cea_db_is_*() functions
drm/edid: convertadd_cea_modes()to use cea db iter drm/edid: convertdrm_edid_to_speaker_allocation()to use cea db iter drm/edid: convertdrm_edid_to_sad()to use cea db iter drm/edid: convertdrm_detect_hdmi_monitor()to use cea db iter drm/edid: convertdrm_detect_monitor_audio()to use cea db iter drm/edid: convertdrm_parse_cea_ext()to use cea db iter drm/edid: convertdrm_edid_to_eld()to use cea db iter drm/edid: sunset the old unused cea data block iterators drm/edid: restore some type safety to cea_db_*() functions drm/edid: detect basic audio only on CEA extension drm/edid: detect color formats and CEA revision only on CEA extension drm/edid: skip CEA extension scan indrm_edid_to_eld()just for CEA
rev
drm/edid: sunsetdrm_find_cea_extension()drivers/gpu/drm/drm_connector.c | 2 +- drivers/gpu/drm/drm_debugfs.c | 3 +- drivers/gpu/drm/drm_edid.c | 781 ++++++++++++++++++-------------- include/drm/drm_edid.h | 2 + 4 files changed, 455 insertions(+), 333 deletions(-)Signature · 1 line
2.30.2
Signature · 2 lines
Ville Syrjälä Intel