drm/edid: low level EDID block read refactoring etc.
Subsystems (2)
cover drm/edid: low level EDID block read refactoring etc.
Ever so slowly moving towards cleaner EDID reading.
Jani Nikula (12):
drm/edid: convert edid_is_zero() to edid_block_is_zero() for blocks drm/edid: have edid_block_check() detect blocks that are all zero drm/edid: refactor EDID block status printing
drm/edid: add a helper to log dump an EDID block drm/edid: pass struct edid to connector_bad_edid() drm/edid: add typedef for block read function
drm/edid: abstract an EDID block read helper
drm/edid: use EDID block read helper in drm_do_get_edid() drm/edid: convert extension block read to EDID block read helper drm/edid: drop extra local var
drm/edid: add single point of return to drm_do_get_edid() drm/edid: add EDID block count and size helpers
drivers/gpu/drm/drm_edid.c | 350 ++++++++++++++++++++++++------------- 1 file changed, 225 insertions(+), 125 deletions(-)
Signature · 1 line
2.30.2
PATCH 2/12 drm/edid: have edid_block_check() detect blocks that are all zero
We have the check function, have it also detect blocks that are all zero instead of leaving that to callers.
--- drivers/gpu/drm/drm_edid.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
drivers/gpu/drm/drm_edid.c +14 -5
@@ -1671,6 +1671,7 @@ EXPORT_SYMBOL(drm_edid_are_equal);enum edid_block_status {EDID_BLOCK_OK =0 ,EDID_BLOCK_NULL , +EDID_BLOCK_ZERO ,EDID_BLOCK_HEADER_CORRUPT ,EDID_BLOCK_HEADER_REPAIR ,EDID_BLOCK_HEADER_FIXED ,
@@ -1689,15 +1690,23 @@ static enum edid_block_status edid_block_check(const void *_block,if (is_base_block) {int score =drm_edid_header_is_valid (block); -if (score <clamp (edid_fixup,0 ,8 )) -return EDID_BLOCK_HEADER_CORRUPT ; +if (score <clamp (edid_fixup,0 ,8 )) { +if (edid_block_is_zero (block)) +return EDID_BLOCK_ZERO ; +else +return EDID_BLOCK_HEADER_CORRUPT ; + }if (score <8 )return EDID_BLOCK_HEADER_REPAIR ; } -if (edid_block_compute_checksum (block) !=edid_block_get_checksum (block)) -return EDID_BLOCK_CHECKSUM ; +if (edid_block_compute_checksum (block) !=edid_block_get_checksum (block)) { +if (edid_block_is_zero (block)) +return EDID_BLOCK_ZERO ; +else +return EDID_BLOCK_CHECKSUM ; + }if (is_base_block) {if (block->version !=1 )
@@ -1785,7 +1794,7 @@ bool drm_edid_block_valid(u8 *_block, int block_num, bool print_bad_edid, }if (!valid && print_bad_edid) { -if (edid_block_is_zero (block)) { +if (status ==EDID_BLOCK_ZERO ) {pr_notice ("EDID block is all zeroes\n" ); }else {pr_notice ("Raw EDID:\n" );
Signature · 1 line
2.30.2
PATCH 3/12 drm/edid: refactor EDID block status printing
In reply to Jani NikulaSplit out a function to log EDID block status. The printouts get changed slightly.
Unfortunately, not all users will have struct drm_device available, so we convert to pr_* debug logging instead of drm device based logging.
--- drivers/gpu/drm/drm_edid.c | 75 ++++++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 24 deletions(-)
drivers/gpu/drm/drm_edid.c +51 -24
@@ -1729,6 +1729,50 @@ static bool edid_block_valid(const void *block, bool base) edid_block_tag(block)); } +static void edid_block_status_print (enum edid_block_status status, +const struct edid *block, +int block_num) +{ +switch (status) { +case EDID_BLOCK_OK : +break ; +case EDID_BLOCK_NULL : +pr_debug ("EDID block %d pointer is NULL\n" , block_num); +break ; +case EDID_BLOCK_ZERO : +pr_notice ("EDID block %d is all zeroes\n" , block_num); +break ; +case EDID_BLOCK_HEADER_CORRUPT : +pr_notice ("EDID has corrupt header\n" ); +break ; +case EDID_BLOCK_HEADER_REPAIR : +pr_debug ("EDID corrupt header needs repair\n" ); +break ; +case EDID_BLOCK_HEADER_FIXED : +pr_debug ("EDID corrupt header fixed\n" ); +break ; +case EDID_BLOCK_CHECKSUM : +if (edid_block_status_valid (status,edid_block_tag (block))) { +pr_debug ("EDID block %d (tag 0x%02x) checksum is invalid, remainder is %d, ignoring\n" , + block_num,edid_block_tag (block), +edid_block_compute_checksum (block)); + }else { +pr_notice ("EDID block %d (tag 0x%02x) checksum is invalid, remainder is %d\n" , + block_num,edid_block_tag (block), +edid_block_compute_checksum (block)); + } +break ; +case EDID_BLOCK_VERSION : +pr_notice ("EDID has major version %d, instead of 1\n" , + block->version); +break ; +default : +pr_debug ("EDID block %d unknown edid block status code %d\n" , + block_num, status); +break ; + } +} +/** * drm_edid_block_valid - Sanity check the EDID block (base or extension) * @raw_edid: pointer to raw EDID block
@@ -1775,33 +1819,16 @@ bool drm_edid_block_valid(u8 *_block, int block_num, bool print_bad_edid, *edid_corrupt = true; } +edid_block_status_print (status, block, block_num); +/* Determine whether we can use this block with this status. */ valid =edid_block_status_valid (status,edid_block_tag (block)); -/* Some fairly random status printouts. */ -if (status ==EDID_BLOCK_CHECKSUM ) { -if (valid) { -DRM_DEBUG ("EDID block checksum is invalid, remainder is %d\n" , -edid_block_compute_checksum (block)); -DRM_DEBUG ("Assuming a KVM switch modified the block but left the original checksum\n" ); - }else if (print_bad_edid) { -DRM_NOTE ("EDID block checksum is invalid, remainder is %d\n" , -edid_block_compute_checksum (block)); - } - }else if (status ==EDID_BLOCK_VERSION ) { -DRM_NOTE ("EDID has major version %d, instead of 1\n" , - block->version); - } - -if (!valid && print_bad_edid) { -if (status ==EDID_BLOCK_ZERO ) { -pr_notice ("EDID block is all zeroes\n" ); - }else { -pr_notice ("Raw EDID:\n" ); -print_hex_dump (KERN_NOTICE , -" \t" ,DUMP_PREFIX_NONE ,16 ,1 , - block,EDID_LENGTH , false); - } +if (!valid && print_bad_edid && status !=EDID_BLOCK_ZERO ) { +pr_notice ("Raw EDID:\n" ); +print_hex_dump (KERN_NOTICE , +" \t" ,DUMP_PREFIX_NONE ,16 ,1 , + block,EDID_LENGTH , false); }return valid;
Signature · 1 line
2.30.2
PATCH 4/12 drm/edid: add a helper to log dump an EDID block
In reply to Jani NikulaUnify debug log dumping. There's duplication in the error paths for EDID block validity checks, but this should be neglible.
--- drivers/gpu/drm/drm_edid.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-)
drivers/gpu/drm/drm_edid.c +19 -14
@@ -1773,6 +1773,23 @@ static void edid_block_status_print(enum edid_block_status status, } } +static void edid_block_dump (const char *level,const void *block,int block_num) +{ +enum edid_block_status status; +char prefix[20 ]; + + status =edid_block_check (block, block_num ==0 ); +if (status ==EDID_BLOCK_ZERO ) +sprintf (prefix,"\t[%02x] ZERO " , block_num); +else if (!edid_block_status_valid (status,edid_block_tag (block))) +sprintf (prefix,"\t[%02x] BAD " , block_num); +else +sprintf (prefix,"\t[%02x] GOOD " , block_num); + +print_hex_dump (level, prefix,DUMP_PREFIX_NONE ,16 ,1 , + block,EDID_LENGTH , false); +} +/** * drm_edid_block_valid - Sanity check the EDID block (base or extension) * @raw_edid: pointer to raw EDID block
@@ -1826,9 +1843,7 @@ bool drm_edid_block_valid(u8 *_block, int block_num, bool print_bad_edid,if (!valid && print_bad_edid && status !=EDID_BLOCK_ZERO ) {pr_notice ("Raw EDID:\n" ); -print_hex_dump (KERN_NOTICE , -" \t" ,DUMP_PREFIX_NONE ,16 ,1 , - block,EDID_LENGTH , false); +edid_block_dump (KERN_NOTICE , block, block_num); }return valid;
@@ -1976,18 +1991,8 @@ static void connector_bad_edid(struct drm_connector *connector,drm_dbg_kms (connector->dev,"%s: EDID is invalid:\n" , connector->name);for (i =0 ; i < num_blocks; i++) {u8 *block = edid + i *EDID_LENGTH ; -char prefix[20 ]; - -if (edid_block_is_zero (block)) -sprintf (prefix,"\t[%02x] ZERO " , i); -else if (!drm_edid_block_valid (block, i, false,NULL )) -sprintf (prefix,"\t[%02x] BAD " , i); -else -sprintf (prefix,"\t[%02x] GOOD " , i); -print_hex_dump (KERN_DEBUG , - prefix,DUMP_PREFIX_NONE ,16 ,1 , - block,EDID_LENGTH , false); +edid_block_dump (KERN_DEBUG , block, i); } }
Signature · 1 line
2.30.2
PATCH 1/12 drm/edid: convert edid_is_zero() to edid_block_is_zero() for blocks
In reply to Jani NikulaAs edid_is_zero() is only ever used on EDID blocks, convert it to edid_block_is_zero() with implicit block size.
--- drivers/gpu/drm/drm_edid.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/drm_edid.c +5 -5
@@ -1632,9 +1632,9 @@ static int edid_block_tag(const void *_block)return block[0 ]; } -static bool edid_is_zero (const void *edid,int length) +static bool edid_block_is_zero (const void *edid) { -return !memchr_inv (edid,0 , length); +return !memchr_inv (edid,0 ,EDID_LENGTH ); }/**
@@ -1785,7 +1785,7 @@ bool drm_edid_block_valid(u8 *_block, int block_num, bool print_bad_edid, }if (!valid && print_bad_edid) { -if (edid_is_zero (block,EDID_LENGTH )) { +if (edid_block_is_zero (block)) {pr_notice ("EDID block is all zeroes\n" ); }else {pr_notice ("Raw EDID:\n" );
@@ -1942,7 +1942,7 @@ static void connector_bad_edid(struct drm_connector *connector,u8 *block = edid + i *EDID_LENGTH ;char prefix[20 ]; -if (edid_is_zero (block,EDID_LENGTH )) +if (edid_block_is_zero (block))sprintf (prefix,"\t[%02x] ZERO " , i);else if (!drm_edid_block_valid (block, i, false,NULL ))sprintf (prefix,"\t[%02x] BAD " , i);
@@ -2019,7 +2019,7 @@ static struct edid *drm_do_get_edid_base_block(struct drm_connector *connector, goto out;if (drm_edid_block_valid (edid,0 , false, edid_corrupt))break ; -if (try ==0 &&edid_is_zero (edid,EDID_LENGTH )) { +if (try ==0 &&edid_block_is_zero (edid)) {if (null_edid_counter) (*null_edid_counter)++; goto carp;
Signature · 1 line
2.30.2
PATCH 5/12 drm/edid: pass struct edid to connector_bad_edid()
In reply to Jani NikulaAvoid casting here and there, and make it const.
--- drivers/gpu/drm/drm_edid.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/gpu/drm/drm_edid.c +6 -9
@@ -1967,7 +1967,7 @@ drm_do_probe_ddc_edid(void *data, u8 *buf, unsigned int block, size_t len) }static void connector_bad_edid (struct drm_connector *connector, -u8 *edid,int num_blocks) +const struct edid *edid,int num_blocks) {int i;u8 last_block;
@@ -1978,22 +1978,19 @@ static void connector_bad_edid(struct drm_connector *connector,* of 0x7e in the EDID of the _index_ of the last block in the * combined chunk of memory. */ - last_block = edid[0x7e ]; + last_block = edid->extensions;/* Calculate real checksum for the last edid extension block data */ if (last_block < num_blocks) connector->real_edid_checksum = -edid_block_compute_checksum (edid + last_block *EDID_LENGTH ); +edid_block_compute_checksum (edid + last_block);if (connector->bad_edid_counter++ && !drm_debug_enabled (DRM_UT_KMS ))return ;drm_dbg_kms (connector->dev,"%s: EDID is invalid:\n" , connector->name); -for (i =0 ; i < num_blocks; i++) { -u8 *block = edid + i *EDID_LENGTH ; - -edid_block_dump (KERN_DEBUG , block, i); - } +for (i =0 ; i < num_blocks; i++) +edid_block_dump (KERN_DEBUG , edid + i, i); }/* Get override or firmware EDID */
@@ -2139,7 +2136,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector, }if (invalid_blocks) { -connector_bad_edid (connector, (u8 *)edid, edid->extensions +1 ); +connector_bad_edid (connector, edid, edid->extensions +1 ); edid =edid_filter_invalid_blocks (edid, invalid_blocks); }
Signature · 1 line
2.30.2
PATCH 6/12 drm/edid: add typedef for block read function
In reply to Jani NikulaMake the callback a bit easier on the eye.
--- drivers/gpu/drm/drm_edid.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/gpu/drm/drm_edid.c +9 -9
@@ -2037,10 +2037,11 @@ int drm_add_override_edid_modes(struct drm_connector *connector) }EXPORT_SYMBOL (drm_add_override_edid_modes); +typedef int read_block_fn (void *context,u8 *buf,unsigned int block,size_t len); +static struct edid *drm_do_get_edid_base_block (struct drm_connector *connector, -int (*get_edid_block)(void *data,u8 *buf,unsigned int block, -size_t len), -void *data) +read_block_fn read_block, +void *context) {int *null_edid_counter = connector ? &connector->null_edid_counter :NULL ;bool *edid_corrupt = connector ? &connector->edid_corrupt :NULL ;
@@ -2053,7 +2054,7 @@ static struct edid *drm_do_get_edid_base_block(struct drm_connector *connector,/* base block fetch */ for (try =0 ; try <4 ; try++) { -if (get_edid_block (data, edid,0 ,EDID_LENGTH )) +if (read_block (context, edid,0 ,EDID_LENGTH )) goto out;if (drm_edid_block_valid (edid,0 , false, edid_corrupt))break ;
@@ -2097,9 +2098,8 @@ static struct edid *drm_do_get_edid_base_block(struct drm_connector *connector,* Return: Pointer to valid EDID or NULL if we couldn't find any. */ struct edid *drm_do_get_edid (struct drm_connector *connector, -int (*get_edid_block)(void *data,u8 *buf,unsigned int block, -size_t len), -void *data) +read_block_fn read_block, +void *context) {int j, invalid_blocks =0 ;struct edid *edid, *new, *override;
@@ -2108,7 +2108,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,if (override)return override; - edid =drm_do_get_edid_base_block (connector, get_edid_block, data); + edid =drm_do_get_edid_base_block (connector, read_block, context);if (!edid)return NULL ;
@@ -2125,7 +2125,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,int try;for (try =0 ; try <4 ; try++) { -if (get_edid_block (data, block, j,EDID_LENGTH )) +if (read_block (context, block, j,EDID_LENGTH )) goto out;if (drm_edid_block_valid (block, j, false,NULL ))break ;
Signature · 1 line
2.30.2
PATCH 7/12 drm/edid: abstract an EDID block read helper
In reply to Jani NikulaWe have an abstraction for the EDID base block read, yet duplicating the retries and error handling for extension block reads. Introduce a more generic EDID block read helper.
Switch to the helper piecemeal, starting with drm_edid_get_panel_id(), which doesn't need or have access to the connector anyway.
The subtle change is switching from drm_edid_block_valid() to edid_block_check(). We also status print once, not for every attempt.
--- drivers/gpu/drm/drm_edid.c | 58 +++++++++++++++++++++++++++++++++----- 1 file changed, 51 insertions(+), 7 deletions(-)
drivers/gpu/drm/drm_edid.c +51 -7
@@ -1670,6 +1670,7 @@ EXPORT_SYMBOL(drm_edid_are_equal);enum edid_block_status {EDID_BLOCK_OK =0 , +EDID_BLOCK_READ_FAIL ,EDID_BLOCK_NULL ,EDID_BLOCK_ZERO ,EDID_BLOCK_HEADER_CORRUPT ,
@@ -1736,6 +1737,9 @@ static void edid_block_status_print(enum edid_block_status status,switch (status) {case EDID_BLOCK_OK :break ; +case EDID_BLOCK_READ_FAIL : +pr_debug ("EDID block %d read failed\n" , block_num); +break ;case EDID_BLOCK_NULL :pr_debug ("EDID block %d pointer is NULL\n" , block_num);break ;
@@ -2039,6 +2043,39 @@ EXPORT_SYMBOL(drm_add_override_edid_modes);typedef int read_block_fn (void *context,u8 *buf,unsigned int block,size_t len); +static enum edid_block_status edid_block_read (void *block,unsigned int block_num, +read_block_fn read_block, +void *context) +{ +enum edid_block_status status; +bool is_base_block = block_num ==0 ; +int try; + +for (try =0 ; try <4 ; try++) { +if (read_block (context, block, block_num,EDID_LENGTH )) +return EDID_BLOCK_READ_FAIL ; + + status =edid_block_check (block, is_base_block); +if (status ==EDID_BLOCK_HEADER_REPAIR ) { +edid_header_fix (block); + +/* Retry with fixed header, update status if that worked. */ + status =edid_block_check (block, is_base_block); +if (status ==EDID_BLOCK_OK ) + status =EDID_BLOCK_HEADER_FIXED ; + } + +if (edid_block_status_valid (status,edid_block_tag (block))) +break ; + +/* Fail early for unrepairable base block all zeros. */ +if (try ==0 && is_base_block && status ==EDID_BLOCK_ZERO ) +break ; + } + +return status; +} +static struct edid *drm_do_get_edid_base_block (struct drm_connector *connector,read_block_fn read_block,void *context)
@@ -2237,20 +2274,27 @@ static u32 edid_extract_panel_id(const struct edid *edid)u32 drm_edid_get_panel_id (struct i2c_adapter *adapter) { -const struct edid *edid; -u32 panel_id; - - edid =drm_do_get_edid_base_block (NULL , drm_do_probe_ddc_edid, adapter); +enum edid_block_status status; +void *base_block; +u32 panel_id =0 ;/* * There are no manufacturer IDs of 0, so if there is a problem reading * the EDID then we'll just return 0. */ -if (!edid) + + base_block =kmalloc (EDID_LENGTH ,GFP_KERNEL ); +if (!base_block)return 0 ; - panel_id =edid_extract_panel_id (edid); -kfree (edid); + status =edid_block_read (base_block,0 , drm_do_probe_ddc_edid, adapter); + +edid_block_status_print (status, base_block,0 ); + +if (edid_block_status_valid (status,edid_block_tag (base_block))) + panel_id =edid_extract_panel_id (base_block); + +kfree (base_block);return panel_id; }
Signature · 1 line
2.30.2
PATCH 8/12 drm/edid: use EDID block read helper in drm_do_get_edid()
In reply to Jani NikulaConvert drm_do_get_edit() from the base block read helper to the generic block read helper. There's quite a bit going on here, as the corrupt and null EDID information is moved back to the caller. As we see, they were not all that clear to begin with, and this change underlines that.
--- drivers/gpu/drm/drm_edid.c | 62 ++++++++++++++------------------------ 1 file changed, 23 insertions(+), 39 deletions(-)
drivers/gpu/drm/drm_edid.c +23 -39
@@ -2076,44 +2076,6 @@ static enum edid_block_status edid_block_read(void *block, unsigned int block_nureturn status; } -static struct edid *drm_do_get_edid_base_block (struct drm_connector *connector, -read_block_fn read_block, -void *context) -{ -int *null_edid_counter = connector ? &connector->null_edid_counter :NULL ; -bool *edid_corrupt = connector ? &connector->edid_corrupt :NULL ; -void *edid; -int try; - - edid =kmalloc (EDID_LENGTH ,GFP_KERNEL ); -if (edid ==NULL ) -return NULL ; - -/* base block fetch */ -for (try =0 ; try <4 ; try++) { -if (read_block (context, edid,0 ,EDID_LENGTH )) - goto out; -if (drm_edid_block_valid (edid,0 , false, edid_corrupt)) -break ; -if (try ==0 &&edid_block_is_zero (edid)) { -if (null_edid_counter) - (*null_edid_counter)++; - goto carp; - } - } -if (try ==4 ) - goto carp; - -return edid; - -carp: -if (connector) -connector_bad_edid (connector, edid,1 ); -out: -kfree (edid); -return NULL ; -} -/** * drm_do_get_edid - get EDID data using a custom EDID block read function * @connector: connector we're probing
@@ -2138,6 +2100,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,read_block_fn read_block, void *context) { + enum edid_block_status status;int j, invalid_blocks =0 ;struct edid *edid, *new, *override;
@@ -2145,10 +2108,31 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,if (override)return override; - edid =drm_do_get_edid_base_block (connector, read_block, context); + edid =kmalloc (EDID_LENGTH ,GFP_KERNEL );if (!edid)return NULL ; + status =edid_block_read (edid,0 , read_block, context); + +edid_block_status_print (status, edid,0 ); + +if (status ==EDID_BLOCK_READ_FAIL ) + goto out; + +/* FIXME: Clarify what a corrupt EDID actually means. */ +if (status ==EDID_BLOCK_OK || status ==EDID_BLOCK_VERSION ) + connector->edid_corrupt = false; +else + connector->edid_corrupt = true; + +if (!edid_block_status_valid (status,edid_block_tag (edid))) { +if (status ==EDID_BLOCK_ZERO ) + connector->null_edid_counter++; + +connector_bad_edid (connector, edid,1 ); + goto out; + } +if (edid->extensions ==0 )return edid;
Signature · 1 line
2.30.2
PATCH 9/12 drm/edid: convert extension block read to EDID block read helper
In reply to Jani NikulaUse the EDID block read helper also for extension block reads, making edid_block_read() the only place with the read retry logic.
Note: We observe that drm_do_get_edid() does not use invalid extension blocks to flag the EDID as corrupt.
--- drivers/gpu/drm/drm_edid.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/gpu/drm/drm_edid.c +7 -8
@@ -2143,17 +2143,16 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,for (j =1 ; j <= edid->extensions; j++) {void *block = edid + j; -int try; -for (try =0 ; try <4 ; try++) { -if (read_block (context, block, j,EDID_LENGTH )) - goto out; -if (drm_edid_block_valid (block, j, false,NULL )) -break ; - } + status =edid_block_read (block, j, read_block, context); -if (try ==4 ) +edid_block_status_print (status, block, j); + +if (!edid_block_status_valid (status,edid_block_tag (block))) { +if (status ==EDID_BLOCK_READ_FAIL ) + goto out; invalid_blocks++; + } }if (invalid_blocks) {
Signature · 1 line
2.30.2
PATCH 10/12 drm/edid: drop extra local var
In reply to Jani NikulaWe don't need override as a variable for anything.
--- drivers/gpu/drm/drm_edid.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_edid.c +4 -4
@@ -2102,11 +2102,11 @@ struct edid *drm_do_get_edid(struct drm_connector *connector, {enum edid_block_status status;int j, invalid_blocks =0 ; -struct edid *edid, *new, *override; +struct edid *edid, *new; - override =drm_get_override_edid (connector); -if (override) -return override; + edid =drm_get_override_edid (connector); +if (edid) +return edid; edid =kmalloc (EDID_LENGTH ,GFP_KERNEL );if (!edid)
Signature · 1 line
2.30.2
PATCH 11/12 drm/edid: add single point of return to drm_do_get_edid()
In reply to Jani NikulaThis will be useful in the future. Use fail label for fail exit.
--- drivers/gpu/drm/drm_edid.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/gpu/drm/drm_edid.c +8 -7
@@ -2106,7 +2106,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector, edid =drm_get_override_edid (connector);if (edid) -return edid; + goto ok; edid =kmalloc (EDID_LENGTH ,GFP_KERNEL );if (!edid)
@@ -2117,7 +2117,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,edid_block_status_print (status, edid,0 );if (status ==EDID_BLOCK_READ_FAIL ) - goto out; + goto fail;/* FIXME: Clarify what a corrupt EDID actually means. */ if (status ==EDID_BLOCK_OK || status ==EDID_BLOCK_VERSION )
@@ -2130,15 +2130,15 @@ struct edid *drm_do_get_edid(struct drm_connector *connector, connector->null_edid_counter++;connector_bad_edid (connector, edid,1 ); - goto out; + goto fail; }if (edid->extensions ==0 ) -return edid; + goto ok; new =krealloc (edid, (edid->extensions +1 ) *EDID_LENGTH ,GFP_KERNEL );if (!new) - goto out; + goto fail; edid = new;for (j =1 ; j <= edid->extensions; j++) {
@@ -2150,7 +2150,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,if (!edid_block_status_valid (status,edid_block_tag (block))) {if (status ==EDID_BLOCK_READ_FAIL ) - goto out; + goto fail; invalid_blocks++; } }
@@ -2161,9 +2161,10 @@ struct edid *drm_do_get_edid(struct drm_connector *connector, edid =edid_filter_invalid_blocks (edid, invalid_blocks); } +ok:return edid; -out: +fail:kfree (edid);return NULL ; }
Signature · 1 line
2.30.2
PATCH 12/12 drm/edid: add EDID block count and size helpers
In reply to Jani NikulaAdd some helpers to figure out the EDID extension block count, block count, size, pointers to blocks.
Unfortunately, we'll need to cast away the const in a few places where we actually need to access the data.
--- drivers/gpu/drm/drm_edid.c | 78 +++++++++++++++++++++++++++----------- 1 file changed, 56 insertions(+), 22 deletions(-)
drivers/gpu/drm/drm_edid.c +56 -22
@@ -1568,6 +1568,38 @@ static const struct drm_display_mode edid_4k_modes[] = {/*** DDC fetch and block validation ***/ +static int edid_extension_block_count (const struct edid *edid) +{ +return edid->extensions; +} + +static int edid_block_count (const struct edid *edid) +{ +return edid_extension_block_count (edid) +1 ; +} + +static int edid_size_by_blocks (int num_blocks) +{ +return num_blocks *EDID_LENGTH ; +} + +static int edid_size (const struct edid *edid) +{ +return edid_size_by_blocks (edid_block_count (edid)); +} + +static const void *edid_block_data (const struct edid *edid,int index) +{ +BUILD_BUG_ON (sizeof (*edid) !=EDID_LENGTH ); + +return edid + index; +} + +static const void *edid_extension_block_data (const struct edid *edid,int index) +{ +return edid_block_data (edid, index +1 ); +} +static const u8 edid_header[] = {0x00 ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0x00 };
@@ -1654,8 +1686,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 =edid_size (edid1); + edid2_len =edid_size (edid2);if (edid1_len != edid2_len)return false;
@@ -1865,14 +1897,16 @@ EXPORT_SYMBOL(drm_edid_block_valid);bool drm_edid_is_valid (struct edid *edid) {int i; -u8 *raw = (u8 *)edid;if (!edid)return false; -for (i =0 ; i <= edid->extensions; i++) -if (!drm_edid_block_valid (raw + i *EDID_LENGTH , i, true,NULL )) +for (i =0 ; i <edid_block_count (edid); i++) { +void *block = (void *)edid_block_data (edid, i); + +if (!drm_edid_block_valid (block, i, true,NULL ))return false; + }return true; }
@@ -1885,13 +1919,13 @@ static struct edid *edid_filter_invalid_blocks(const struct edid *edid,int valid_extensions = edid->extensions - invalid_blocks;int i; - new =kmalloc_array (valid_extensions +1 ,EDID_LENGTH ,GFP_KERNEL ); + new =kmalloc (edid_size_by_blocks (valid_extensions +1 ),GFP_KERNEL );if (!new) goto out; dest_block = new; -for (i =0 ; i <= edid->extensions; i++) { -const void *block = edid + i; +for (i =0 ; i <edid_block_count (edid); i++) { +const void *block =edid_block_data (edid, i);if (edid_block_valid (block, i ==0 ))memcpy (dest_block++, block,EDID_LENGTH );
@@ -2101,7 +2135,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector, void *context) {enum edid_block_status status; -int j, invalid_blocks =0 ; +int i, invalid_blocks =0 ;struct edid *edid, *new; edid =drm_get_override_edid (connector);
@@ -2133,18 +2167,18 @@ struct edid *drm_do_get_edid(struct drm_connector *connector, goto fail; } -if (edid->extensions ==0 ) +if (!edid_extension_block_count (edid) ==0 ) goto ok; - new =krealloc (edid, (edid->extensions +1 ) *EDID_LENGTH ,GFP_KERNEL ); + new =krealloc (edid,edid_size (edid),GFP_KERNEL );if (!new) goto fail; edid = new; -for (j =1 ; j <= edid->extensions; j++) { -void *block = edid + j; +for (i =1 ; i <edid_block_count (edid); i++) { +void *block = (void *)edid_block_data (edid, i); - status =edid_block_read (block, j, read_block, context); + status =edid_block_read (block, i, read_block, context);edid_block_status_print (status, block, j);
@@ -2156,7 +2190,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector, }if (invalid_blocks) { -connector_bad_edid (connector, edid, edid->extensions +1 ); +connector_bad_edid (connector, edid,edid_block_count (edid)); edid =edid_filter_invalid_blocks (edid, invalid_blocks); }
@@ -2321,7 +2355,7 @@ EXPORT_SYMBOL(drm_get_edid_switcheroo);*/ struct edid *drm_edid_duplicate (const struct edid *edid) { -return kmemdup (edid, (edid->extensions +1 ) *EDID_LENGTH ,GFP_KERNEL ); +return kmemdup (edid,edid_size (edid),GFP_KERNEL ); }EXPORT_SYMBOL (drm_edid_duplicate);
@@ -2505,8 +2539,8 @@ drm_for_each_detailed_block(const struct edid *edid, detailed_cb *cb, void *closfor (i =0 ; i <EDID_DETAILED_TIMINGS ; i++)cb (&(edid->detailed_timings[i]), closure); -for (i =1 ; i <= edid->extensions; i++) { -const u8 *ext = (const u8 *)edid + (i *EDID_LENGTH ); +for (i =0 ; i <edid_extension_block_count (edid); i++) { +const u8 *ext =edid_extension_block_data (edid, i);switch (*ext) {case CEA_EXT :
@@ -3476,17 +3510,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 || !edid_extension_block_count (edid))return NULL ;/* Find CEA extension */ -for (i = *ext_index; i < edid->extensions; i++) { - edid_ext = (const u8 *)edid +EDID_LENGTH * (i +1 ); +for (i = *ext_index; i <edid_extension_block_count (edid); i++) { + edid_ext =edid_extension_block_data (edid, i);if (edid_block_tag (edid_ext) == ext_id)break ; } -if (i >= edid->extensions) +if (i >=edid_extension_block_count (edid))return NULL ; *ext_index = i +1 ;
Signature · 1 line
2.30.2
Re: [PATCH 03/12] drm/edid: refactor EDID block status printing
In reply to Jani NikulaQuoted 49 lines · Jani Nikula
Split out a function to log EDID block status. The printouts get changed slightly.
Unfortunately, not all users will have struct
drm_deviceavailable, so we convert to pr_* debug logging instead of drm device based logging.Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/drm_edid.c | 75 ++++++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 24 deletions(-)drivers/gpu/drm/drm_edid.c +30
-0@@ -1729,6 +1729,50 @@ static bool edid_block_valid(const void *block, bool base) edid_block_tag(block)); } +static void edid_block_status_print (enum edid_block_status status, +const struct edid *block, +int block_num) +{ +switch (status) { +case EDID_BLOCK_OK : +break ; +case EDID_BLOCK_NULL : +pr_debug ("EDID block %d pointer is NULL\n" , block_num); +break ; +case EDID_BLOCK_ZERO : +pr_notice ("EDID block %d is all zeroes\n" , block_num); +break ; +case EDID_BLOCK_HEADER_CORRUPT : +pr_notice ("EDID has corrupt header\n" ); +break ; +case EDID_BLOCK_HEADER_REPAIR : +pr_debug ("EDID corrupt header needs repair\n" ); +break ; +case EDID_BLOCK_HEADER_FIXED : +pr_debug ("EDID corrupt header fixed\n" ); +break ; +case EDID_BLOCK_CHECKSUM : +if (edid_block_status_valid (status,edid_block_tag (block))) { +pr_debug ("EDID block %d (tag 0x%02x) checksum is invalid, remainder is %d, ignoring\n" , + block_num,edid_block_tag (block), +edid_block_compute_checksum (block)); + }else { + pr_notice("EDID block %d (tag 0x%02x) checksum is invalid, remainder is %d\n", + block_num, edid_block_tag(block),
drivers/gpu/drm/drm_edid.c static bool edid_block_valid(const void *block, bool base) · line 1771
Quoted 10 lines
drivers/gpu/drm/drm_edid.c +10
-0+ edid_block_compute_checksum(block)); + } +break ; +case EDID_BLOCK_VERSION : +pr_notice ("EDID has major version %d, instead of 1\n" , + block->version); +break ; +default : +pr_debug ("EDID block %d unknown edid block status code %d\n" , + block_num, status);
Maybe this should complaing a bit more loudly. Indicates a bug in the code no?
Quoted 50 lines
drivers/gpu/drm/drm_edid.c +11
-24+break ; + } +} +/** * drm_edid_block_valid - Sanity check the EDID block (base or extension) * @raw_edid: pointer to raw EDID block @@ -1775,33 +1819,16 @@ bool drm_edid_block_valid(u8 *_block, int block_num, bool print_bad_edid, *edid_corrupt = true; } +edid_block_status_print (status, block, block_num); +/* Determine whether we can use this block with this status. */ valid =edid_block_status_valid (status,edid_block_tag (block)); -/* Some fairly random status printouts. */ -if (status ==EDID_BLOCK_CHECKSUM ) { -if (valid) { -DRM_DEBUG ("EDID block checksum is invalid, remainder is %d\n" , -edid_block_compute_checksum (block)); -DRM_DEBUG ("Assuming a KVM switch modified the block but left the original checksum\n" ); - }else if (print_bad_edid) { -DRM_NOTE ("EDID block checksum is invalid, remainder is %d\n" , -edid_block_compute_checksum (block)); - } - }else if (status ==EDID_BLOCK_VERSION ) { -DRM_NOTE ("EDID has major version %d, instead of 1\n" , - block->version); - } - -if (!valid && print_bad_edid) { -if (status ==EDID_BLOCK_ZERO ) { -pr_notice ("EDID block is all zeroes\n" ); - }else { -pr_notice ("Raw EDID:\n" ); -print_hex_dump (KERN_NOTICE , -" \t" ,DUMP_PREFIX_NONE ,16 ,1 , - block,EDID_LENGTH , false); - } +if (!valid && print_bad_edid && status !=EDID_BLOCK_ZERO ) { +pr_notice ("Raw EDID:\n" ); +print_hex_dump (KERN_NOTICE , +" \t" ,DUMP_PREFIX_NONE ,16 ,1 , + block,EDID_LENGTH , false); }return valid;Signature · 1 line
2.30.2
Signature · 2 lines
Ville Syrjälä Intel
Re: [PATCH 05/12] drm/edid: pass struct edid to connector_bad_edid()
In reply to Jani NikulaQuoted 34 lines · Jani Nikula
Avoid casting here and there, and make it const.
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/drm_edid.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)drivers/gpu/drm/drm_edid.c +3
-3@@ -1967,7 +1967,7 @@ drm_do_probe_ddc_edid(void *data, u8 *buf, unsigned int block, size_t len) }static void connector_bad_edid (struct drm_connector *connector, -u8 *edid,int num_blocks) +const struct edid *edid,int num_blocks) {int i;u8 last_block;@@ -1978,22 +1978,19 @@ static void connector_bad_edid(struct drm_connector *connector,* of 0x7e in the EDID of the _index_ of the last block in the * combined chunk of memory. */ - last_block = edid[0x7e ]; + last_block = edid->extensions;/* Calculate real checksum for the last edid extension block data */ if (last_block < num_blocks) connector->real_edid_checksum = -edid_block_compute_checksum (edid + last_block *EDID_LENGTH ); +edid_block_compute_checksum (edid + last_block);if (connector->bad_edid_counter++ && !drm_debug_enabled (DRM_UT_KMS ))
drivers/gpu/drm/drm_edid.c static void connector_bad_edid(struct drm_connector *connector, · line 1993
Quoted 10 lines
drivers/gpu/drm/drm_edid.c +2
-5return ;drm_dbg_kms (connector->dev,"%s: EDID is invalid:\n" , connector->name); -for (i =0 ; i < num_blocks; i++) { -u8 *block = edid + i *EDID_LENGTH ; - -edid_block_dump (KERN_DEBUG , block, i); - } +for (i =0 ; i < num_blocks; i++) +edid_block_dump (KERN_DEBUG , edid + i, i);
nit: I'm not a big fan of pointer arithmetic in general. IMO it makes it a bit too easy to miss the fact that it's not counting bytes but rather potentially something much bigger. So I tend to prefer array notation for such things. But looks like most of these go away at the end anyway with the block_data() stuff.
Quoted 14 lines
drivers/gpu/drm/drm_edid.c +1
-1}/* Get override or firmware EDID */ @@ -2139,7 +2136,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector, }if (invalid_blocks) { -connector_bad_edid (connector, (u8 *)edid, edid->extensions +1 ); +connector_bad_edid (connector, edid, edid->extensions +1 ); edid =edid_filter_invalid_blocks (edid, invalid_blocks); }Signature · 1 line
2.30.2
Signature · 2 lines
Ville Syrjälä Intel
Re: [PATCH 06/12] drm/edid: add typedef for block read function
In reply to Jani NikulaQuoted 12 lines · Jani Nikula
Make the callback a bit easier on the eye.
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/drm_edid.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)drivers/gpu/drm/drm_edid.c +0
-0
drivers/gpu/drm/drm_edid.c int drm_add_override_edid_modes(struct drm_connector *connector) · line 2041
Quoted 5 lines
drivers/gpu/drm/drm_edid.c +2
-0@@ -2037,10 +2037,11 @@ int drm_add_override_edid_modes(struct drm_connector *connector) }EXPORT_SYMBOL (drm_add_override_edid_modes); +typedef int read_block_fn (void *context,u8 *buf,unsigned int block,size_t len); +
The header still has the eyesore. Maybe we want to put the typedef there?
Quoted 50 lines
drivers/gpu/drm/drm_edid.c +7
-9static struct edid *drm_do_get_edid_base_block (struct drm_connector *connector, -int (*get_edid_block)(void *data,u8 *buf,unsigned int block, -size_t len), -void *data) +read_block_fn read_block, +void *context) {int *null_edid_counter = connector ? &connector->null_edid_counter :NULL ;bool *edid_corrupt = connector ? &connector->edid_corrupt :NULL ;@@ -2053,7 +2054,7 @@ static struct edid *drm_do_get_edid_base_block(struct drm_connector *connector,/* base block fetch */ for (try =0 ; try <4 ; try++) { -if (get_edid_block (data, edid,0 ,EDID_LENGTH )) +if (read_block (context, edid,0 ,EDID_LENGTH )) goto out;if (drm_edid_block_valid (edid,0 , false, edid_corrupt))break ;@@ -2097,9 +2098,8 @@ static struct edid *drm_do_get_edid_base_block(struct drm_connector *connector,* Return: Pointer to valid EDID or NULL if we couldn't find any. */ struct edid *drm_do_get_edid (struct drm_connector *connector, -int (*get_edid_block)(void *data,u8 *buf,unsigned int block, -size_t len), -void *data) +read_block_fn read_block, +void *context) {int j, invalid_blocks =0 ;struct edid *edid, *new, *override;@@ -2108,7 +2108,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,if (override)return override; - edid =drm_do_get_edid_base_block (connector, get_edid_block, data); + edid =drm_do_get_edid_base_block (connector, read_block, context);if (!edid)return NULL ;@@ -2125,7 +2125,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,int try;for (try =0 ; try <4 ; try++) { -if (get_edid_block (data, block, j,EDID_LENGTH )) +if (read_block (context, block, j,EDID_LENGTH )) goto out;if (drm_edid_block_valid (block, j, false,NULL ))break ;Signature · 1 line
2.30.2
Signature · 2 lines
Ville Syrjälä Intel
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/edid: low level EDID block read refactoring etc.
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/edid: low level EDID block read refactoring etc.
URL : https://patchwork.freedesktop.org/series/102329/
State : failure
== Summary ==
CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
DESCEND objtool
CHK include/generated/compile.h
CC drivers/gpu/drm/drm_edid.odrivers/gpu/drm/drm_edid.c: In function ‘drm_do_get_edid’:drivers/gpu/drm/drm_edid.c:2183:42: error: ‘j’ undeclared (first use in this function)
edid_block_status_print(status, block, j);
^drivers/gpu/drm/drm_edid.c:2183:42: note: each undeclared identifier is reported only once for each function it appears in scripts/Makefile.build:288: recipe for target 'drivers/gpu/drm/drm_edid.o' failed
make[3]: *** [drivers/gpu/drm/drm_edid.o] Error 1scripts/Makefile.build:550: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:550: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1834: recipe for target 'drivers' failed
make: *** [drivers] Error 2
Re: [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/edid: low level EDID block read refactoring etc.
Quoted 8 lines · Patchwork
== Series Details ==
Series: drm/edid: low level EDID block read refactoring etc.
URL : https://patchwork.freedesktop.org/series/102329/
State : failure== Summary ==
Quoted 8 lines
CALL
scripts/checksyscalls.sh
CALLscripts/atomic/check-atomics.sh
DESCEND objtool
CHKinclude/generated/compile.h
CCdrivers/gpu/drm/drm_edid.odrivers/gpu/drm/drm_edid.c: In function ‘drm_do_get_edid’:drivers/gpu/drm/drm_edid.c:2183:42: error: ‘j’ undeclared (first use in this function)
edid_block_status_print(status, block, j);
Argh, last minute rebase fail.
Quoted 12 lines
^
drivers/gpu/drm/drm_edid.c:2183:42: note: each undeclared identifier is reported only once for each function it appears inscripts/Makefile.build:288: recipe for target 'drivers/gpu/drm/drm_edid.o' failed
make[3]: *** [drivers/gpu/drm/drm_edid.o] Error 1scripts/Makefile.build:550: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:550: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1834: recipe for target 'drivers' failed
make: *** [drivers] Error 2
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Quoted 15 lines · Jani Nikula
Ever so slowly moving towards cleaner EDID reading.
Jani Nikula (12):
drm/edid: convertedid_is_zero()toedid_block_is_zero()for blocks drm/edid: haveedid_block_check()detect blocks that are all zero drm/edid: refactor EDID block status printing
drm/edid: add a helper to log dump an EDID block drm/edid: pass struct edid toconnector_bad_edid()drm/edid: add typedef for block read function
drm/edid: abstract an EDID block read helper
drm/edid: use EDID block read helper indrm_do_get_edid()drm/edid: convert extension block read to EDID block read helper drm/edid: drop extra local var
drm/edid: add single point of return todrm_do_get_edid()drm/edid: add EDID block count and size helpers
Some of the stuff was a bit hard to follow, but I suppose that's mostly an indication of the messy state of the current code. Didn't spot anything obviously wrong at least.
Series is
Quoted 6 lines
drivers/gpu/drm/drm_edid.c | 350 ++++++++++++++++++++++++------------- 1 file changed, 225 insertions(+), 125 deletions(-)Signature · 1 line
2.30.2
Signature · 2 lines
Ville Syrjälä Intel
PATCH v2 1/1 drm/edid: add EDID block count and size helpers
In reply to Jani NikulaAdd some helpers to figure out the EDID extension block count, block count, size, pointers to blocks.
Unfortunately, we'll need to cast away the const in a few places where we actually need to access the data.
v2: fix s/j/i/ introduced in a rebase
--- drivers/gpu/drm/drm_edid.c | 80 +++++++++++++++++++++++++++----------- 1 file changed, 57 insertions(+), 23 deletions(-)
drivers/gpu/drm/drm_edid.c +57 -23
@@ -1568,6 +1568,38 @@ static const struct drm_display_mode edid_4k_modes[] = {/*** DDC fetch and block validation ***/ +static int edid_extension_block_count (const struct edid *edid) +{ +return edid->extensions; +} + +static int edid_block_count (const struct edid *edid) +{ +return edid_extension_block_count (edid) +1 ; +} + +static int edid_size_by_blocks (int num_blocks) +{ +return num_blocks *EDID_LENGTH ; +} + +static int edid_size (const struct edid *edid) +{ +return edid_size_by_blocks (edid_block_count (edid)); +} + +static const void *edid_block_data (const struct edid *edid,int index) +{ +BUILD_BUG_ON (sizeof (*edid) !=EDID_LENGTH ); + +return edid + index; +} + +static const void *edid_extension_block_data (const struct edid *edid,int index) +{ +return edid_block_data (edid, index +1 ); +} +static const u8 edid_header[] = {0x00 ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0x00 };
@@ -1654,8 +1686,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 =edid_size (edid1); + edid2_len =edid_size (edid2);if (edid1_len != edid2_len)return false;
@@ -1865,14 +1897,16 @@ EXPORT_SYMBOL(drm_edid_block_valid);bool drm_edid_is_valid (struct edid *edid) {int i; -u8 *raw = (u8 *)edid;if (!edid)return false; -for (i =0 ; i <= edid->extensions; i++) -if (!drm_edid_block_valid (raw + i *EDID_LENGTH , i, true,NULL )) +for (i =0 ; i <edid_block_count (edid); i++) { +void *block = (void *)edid_block_data (edid, i); + +if (!drm_edid_block_valid (block, i, true,NULL ))return false; + }return true; }
@@ -1885,13 +1919,13 @@ static struct edid *edid_filter_invalid_blocks(const struct edid *edid,int valid_extensions = edid->extensions - invalid_blocks;int i; - new =kmalloc_array (valid_extensions +1 ,EDID_LENGTH ,GFP_KERNEL ); + new =kmalloc (edid_size_by_blocks (valid_extensions +1 ),GFP_KERNEL );if (!new) goto out; dest_block = new; -for (i =0 ; i <= edid->extensions; i++) { -const void *block = edid + i; +for (i =0 ; i <edid_block_count (edid); i++) { +const void *block =edid_block_data (edid, i);if (edid_block_valid (block, i ==0 ))memcpy (dest_block++, block,EDID_LENGTH );
@@ -2101,7 +2135,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector, void *context) {enum edid_block_status status; -int j, invalid_blocks =0 ; +int i, invalid_blocks =0 ;struct edid *edid, *new; edid =drm_get_override_edid (connector);
@@ -2133,20 +2167,20 @@ struct edid *drm_do_get_edid(struct drm_connector *connector, goto fail; } -if (edid->extensions ==0 ) +if (!edid_extension_block_count (edid) ==0 ) goto ok; - new =krealloc (edid, (edid->extensions +1 ) *EDID_LENGTH ,GFP_KERNEL ); + new =krealloc (edid,edid_size (edid),GFP_KERNEL );if (!new) goto fail; edid = new; -for (j =1 ; j <= edid->extensions; j++) { -void *block = edid + j; +for (i =1 ; i <edid_block_count (edid); i++) { +void *block = (void *)edid_block_data (edid, i); - status =edid_block_read (block, j, read_block, context); + status =edid_block_read (block, i, read_block, context); -edid_block_status_print (status, block, j); +edid_block_status_print (status, block, i);if (!edid_block_status_valid (status,edid_block_tag (block))) {if (status ==EDID_BLOCK_READ_FAIL )
@@ -2156,7 +2190,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector, }if (invalid_blocks) { -connector_bad_edid (connector, edid, edid->extensions +1 ); +connector_bad_edid (connector, edid,edid_block_count (edid)); edid =edid_filter_invalid_blocks (edid, invalid_blocks); }
@@ -2321,7 +2355,7 @@ EXPORT_SYMBOL(drm_get_edid_switcheroo);*/ struct edid *drm_edid_duplicate (const struct edid *edid) { -return kmemdup (edid, (edid->extensions +1 ) *EDID_LENGTH ,GFP_KERNEL ); +return kmemdup (edid,edid_size (edid),GFP_KERNEL ); }EXPORT_SYMBOL (drm_edid_duplicate);
@@ -2505,8 +2539,8 @@ drm_for_each_detailed_block(const struct edid *edid, detailed_cb *cb, void *closfor (i =0 ; i <EDID_DETAILED_TIMINGS ; i++)cb (&(edid->detailed_timings[i]), closure); -for (i =1 ; i <= edid->extensions; i++) { -const u8 *ext = (const u8 *)edid + (i *EDID_LENGTH ); +for (i =0 ; i <edid_extension_block_count (edid); i++) { +const u8 *ext =edid_extension_block_data (edid, i);switch (*ext) {case CEA_EXT :
@@ -3476,17 +3510,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 || !edid_extension_block_count (edid))return NULL ;/* Find CEA extension */ -for (i = *ext_index; i < edid->extensions; i++) { - edid_ext = (const u8 *)edid +EDID_LENGTH * (i +1 ); +for (i = *ext_index; i <edid_extension_block_count (edid); i++) { + edid_ext =edid_extension_block_data (edid, i);if (edid_block_tag (edid_ext) == ext_id)break ; } -if (i >= edid->extensions) +if (i >=edid_extension_block_count (edid))return NULL ; *ext_index = i +1 ;
Signature · 1 line
2.30.2
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/edid: low level EDID block read refactoring etc. (rev2)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/edid: low level EDID block read refactoring etc. (rev2)
URL : https://patchwork.freedesktop.org/series/102329/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_11472 -> Patchwork_22815
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_22815 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_22815, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/index.html
Participating hosts (47 -> 48)
------------------------------
Additional (4): bat-hsw-1 bat-rpls-2 fi-bwr-2160 bat-adlp-4
Missing (3): fi-bsw-cyan shard-tglu fi-bdw-samus
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_22815:
### CI changes ###
#### Possible regressions ####
* boot:
- fi-bwr-2160: NOTRUN -> [FAIL][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/fi-bwr-2160/boot.html
### IGT changes ###
#### Possible regressions ####
* igt@gem_lmem_swapping@basic:
- fi-cfl-8109u: NOTRUN -> [FAIL][2]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/fi-cfl-8109u/igt@[email protected]
* igt@gem_lmem_swapping@parallel-random-engines:
- fi-hsw-4770: NOTRUN -> [FAIL][3]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/fi-hsw-4770/igt@[email protected]
#### Warnings ####
* igt@runner@aborted:
- fi-rkl-11600: [FAIL][4] ([i915#4312]) -> [FAIL][5]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-rkl-11600/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/fi-rkl-11600/igt@[email protected]
- fi-kbl-7500u: [FAIL][6] ([i915#4312]) -> [FAIL][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-kbl-7500u/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/fi-kbl-7500u/igt@[email protected]
- fi-bxt-dsi: [FAIL][8] ([i915#4312]) -> [FAIL][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-bxt-dsi/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/fi-bxt-dsi/igt@[email protected]
- fi-kbl-7567u: [FAIL][10] ([i915#4312]) -> [FAIL][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-kbl-7567u/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/fi-kbl-7567u/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@gem_lmem_swapping@basic:
- {bat-rpls-2}: NOTRUN -> [SKIP][12] +146 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/bat-rpls-2/igt@[email protected]
- {fi-jsl-1}: [FAIL][13] -> [SKIP][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-jsl-1/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/fi-jsl-1/igt@[email protected]
* igt@gem_lmem_swapping@parallel-random-engines:
- {fi-jsl-1}: NOTRUN -> [FAIL][15]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/fi-jsl-1/igt@[email protected]
* igt@kms_cursor_legacy@basic-flip-after-cursor-atomic:
- {bat-jsl-2}: NOTRUN -> [SKIP][16] +146 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/bat-jsl-2/igt@[email protected]
* igt@runner@aborted:
- {bat-hsw-1}: NOTRUN -> [FAIL][17]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/bat-hsw-1/igt@[email protected]
- {fi-ehl-2}: [FAIL][18] ([i915#4312]) -> [FAIL][19]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-ehl-2/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/fi-ehl-2/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_22815 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_flip@basic-flip-vs-dpms:
- fi-kbl-soraka: NOTRUN -> [SKIP][20] ([fdo#109271]) +146 similar issues
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/fi-kbl-soraka/igt@[email protected]
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-b:
- fi-cfl-8109u: NOTRUN -> [SKIP][21] ([fdo#109271]) +145 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/fi-cfl-8109u/igt@[email protected]
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c:
- fi-cfl-8109u: NOTRUN -> [SKIP][22] ([fdo#109271] / [i915#5341])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/fi-cfl-8109u/igt@[email protected]
- fi-kbl-soraka: NOTRUN -> [SKIP][23] ([fdo#109271] / [i915#5341])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/fi-kbl-soraka/igt@[email protected]
* igt@runner@aborted:
- bat-adlp-4: NOTRUN -> [FAIL][24] ([i915#5457])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/bat-adlp-4/igt@[email protected]
#### Warnings ####
* igt@gem_lmem_swapping@basic:
- fi-hsw-4770: [FAIL][25] -> [SKIP][26] ([fdo#109271])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-hsw-4770/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/fi-hsw-4770/igt@[email protected]
* igt@runner@aborted:
- fi-bsw-kefka: [FAIL][27] ([i915#4312]) -> [FAIL][28] ([i915#3690])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-bsw-kefka/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/fi-bsw-kefka/igt@[email protected]
- fi-cfl-8109u: [FAIL][29] -> [FAIL][30] ([i915#4312])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-cfl-8109u/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/fi-cfl-8109u/igt@[email protected]
- fi-kbl-soraka: [FAIL][31] -> [FAIL][32] ([i915#4312])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-kbl-soraka/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/fi-kbl-soraka/igt@[email protected]
- fi-hsw-4770: [FAIL][33] ([i915#4312]) -> [FAIL][34] ([i915#4312] / [i915#5594])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-hsw-4770/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/fi-hsw-4770/igt@[email protected]
- fi-tgl-1115g4: [FAIL][35] ([i915#4312] / [i915#5257]) -> [FAIL][36] ([i915#3690] / [i915#4312])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-tgl-1115g4/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/fi-tgl-1115g4/igt@[email protected]
- fi-cfl-guc: [FAIL][37] ([i915#4312]) -> [FAIL][38] ([i915#4312] / [i915#5257])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-cfl-guc/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/fi-cfl-guc/igt@[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
[i915#3690]: https://gitlab.freedesktop.org/drm/intel/issues/3690
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#5257]: https://gitlab.freedesktop.org/drm/intel/issues/5257
[i915#5341]: https://gitlab.freedesktop.org/drm/intel/issues/5341
[i915#5457]: https://gitlab.freedesktop.org/drm/intel/issues/5457
[i915#5594]: https://gitlab.freedesktop.org/drm/intel/issues/5594
Build changes
-------------
* Linux: CI_DRM_11472 -> Patchwork_22815
CI-20190529: 20190529
CI_DRM_11472: 85882df13168c5f46b41401b96975de857e3ccac @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6415: c3b690bd5f7fb1fb7ed786ab0f3b815930a6a55f @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_22815: 3c761e57972d29b2b6e9670f53e0b331638e0ad5 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
3c761e57972d drm/edid: add EDID block count and size helpers 645bc2fe8f3c drm/edid: add single point of return to drm_do_get_edid() 00388e0daf46 drm/edid: drop extra local var3c868115c35e drm/edid: convert extension block read to EDID block read helper 1bc23d37f22c drm/edid: use EDID block read helper in drm_do_get_edid() 57813bee76e0 drm/edid: abstract an EDID block read helper 17cd4f624c52 drm/edid: add typedef for block read function 6e44d3caae22 drm/edid: pass struct edid to connector_bad_edid() c65a7953daef drm/edid: add a helper to log dump an EDID block f53bd36df7cf drm/edid: refactor EDID block status printing 89bd3d8dc500 drm/edid: have edid_block_check() detect blocks that are all zero 0eda93c08c59 drm/edid: convert edid_is_zero() to edid_block_is_zero() for blocks
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22815/index.html
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/edid: low level EDID block read refactoring etc. (rev3)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/edid: low level EDID block read refactoring etc. (rev3)
URL : https://patchwork.freedesktop.org/series/102329/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_11472 -> Patchwork_22821
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_22821 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_22821, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22821/index.html
Participating hosts (49 -> 35)
------------------------------
Additional (1): fi-bwr-2160
Missing (15): fi-bdw-samus shard-tglu bat-adls-5 bat-dg1-6 bat-dg1-5 bat-dg2-8 bat-dg2-9 fi-bsw-cyan bat-adlp-6 fi-hsw-4770 bat-rpls-1 shard-rkl shard-dg1 bat-jsl-2 bat-jsl-1
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_22821:
### CI changes ###
#### Possible regressions ####
* boot:
- fi-bwr-2160: NOTRUN -> [FAIL][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22821/fi-bwr-2160/boot.html
### IGT changes ###
#### Warnings ####
* igt@runner@aborted:
- fi-rkl-11600: [FAIL][2] ([i915#4312]) -> [FAIL][3]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-rkl-11600/igt@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22821/fi-rkl-11600/igt@[email protected]
- fi-bdw-5557u: [FAIL][4] ([i915#4312]) -> [FAIL][5]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-bdw-5557u/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22821/fi-bdw-5557u/igt@[email protected]
- fi-rkl-guc: [FAIL][6] ([i915#4312]) -> [FAIL][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-rkl-guc/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22821/fi-rkl-guc/igt@[email protected]
- fi-skl-guc: [FAIL][8] ([i915#4312] / [i915#5257]) -> [FAIL][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-skl-guc/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22821/fi-skl-guc/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@gem_lmem_swapping@basic:
- {fi-tgl-dsi}: NOTRUN -> [SKIP][10] +2 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22821/fi-tgl-dsi/igt@[email protected]
- {fi-jsl-1}: [FAIL][11] -> [SKIP][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-jsl-1/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22821/fi-jsl-1/igt@[email protected]
* igt@gem_lmem_swapping@parallel-random-engines:
- {fi-jsl-1}: NOTRUN -> [FAIL][13]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22821/fi-jsl-1/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_22821 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@core_auth@basic-auth:
- fi-kbl-8809g: NOTRUN -> [SKIP][14] ([fdo#109271]) +1 similar issue
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22821/fi-kbl-8809g/igt@[email protected]
* igt@fbdev@eof:
- fi-kbl-8809g: NOTRUN -> [INCOMPLETE][15] ([i915#5557])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22821/fi-kbl-8809g/igt@[email protected]
* igt@kms_flip@basic-flip-vs-dpms:
- fi-kbl-soraka: NOTRUN -> [SKIP][16] ([fdo#109271]) +146 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22821/fi-kbl-soraka/igt@[email protected]
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c:
- fi-kbl-soraka: NOTRUN -> [SKIP][17] ([fdo#109271] / [i915#5341])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22821/fi-kbl-soraka/igt@[email protected]
#### Warnings ####
* igt@runner@aborted:
- fi-kbl-8809g: [FAIL][18] -> [FAIL][19] ([i915#2722])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-kbl-8809g/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22821/fi-kbl-8809g/igt@[email protected]
- fi-kbl-soraka: [FAIL][20] -> [FAIL][21] ([i915#4312])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-kbl-soraka/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22821/fi-kbl-soraka/igt@[email protected]
- fi-kbl-7500u: [FAIL][22] ([i915#4312]) -> [FAIL][23] ([i915#4312] / [i915#5257])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-kbl-7500u/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22821/fi-kbl-7500u/igt@[email protected]
- fi-tgl-1115g4: [FAIL][24] ([i915#4312] / [i915#5257]) -> [FAIL][25] ([i915#3690] / [i915#4312])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-tgl-1115g4/igt@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22821/fi-tgl-1115g4/igt@[email protected]
- fi-cfl-guc: [FAIL][26] ([i915#4312]) -> [FAIL][27] ([i915#4312] / [i915#5257])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-cfl-guc/igt@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22821/fi-cfl-guc/igt@[email protected]
- fi-kbl-7567u: [FAIL][28] ([i915#4312]) -> [FAIL][29] ([i915#4312] / [i915#5257])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-kbl-7567u/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22821/fi-kbl-7567u/igt@[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
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2722]: https://gitlab.freedesktop.org/drm/intel/issues/2722
[i915#3690]: https://gitlab.freedesktop.org/drm/intel/issues/3690
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#5257]: https://gitlab.freedesktop.org/drm/intel/issues/5257
[i915#5341]: https://gitlab.freedesktop.org/drm/intel/issues/5341
[i915#5557]: https://gitlab.freedesktop.org/drm/intel/issues/5557
Build changes
-------------
* Linux: CI_DRM_11472 -> Patchwork_22821
CI-20190529: 20190529
CI_DRM_11472: 85882df13168c5f46b41401b96975de857e3ccac @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6415: c3b690bd5f7fb1fb7ed786ab0f3b815930a6a55f @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_22821: ee684d1587dc3445c4ebe9fdbdfcd5b5ef451bfc @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
ee684d1587dc drm/edid: add EDID block count and size helpers f6d659a0cd38 drm/edid: add single point of return to drm_do_get_edid() 2278680e71cb drm/edid: drop extra local var7b2cb17a8738 drm/edid: convert extension block read to EDID block read helper de909766a725 drm/edid: use EDID block read helper in drm_do_get_edid() 733a12058f74 drm/edid: abstract an EDID block read helper 62a1f5ab50b6 drm/edid: add typedef for block read function 1977284c4954 drm/edid: pass struct edid to connector_bad_edid() 62a8b9f32239 drm/edid: add a helper to log dump an EDID block b2b3daec975d drm/edid: refactor EDID block status printing 3587c763461b drm/edid: have edid_block_check() detect blocks that are all zero 917f6e3b00e6 drm/edid: convert edid_is_zero() to edid_block_is_zero() for blocks
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22821/index.html
Re: [PATCH 06/12] drm/edid: add typedef for block read function
In reply to Ville SyrjäläQuoted 16 lines · Ville Syrjälä
Quoted 15 lines · Jani Nikula
Make the callback a bit easier on the eye.
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/drm_edid.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)drivers/gpu/drm/drm_edid.c +0
-0@@ -2037,10 +2037,11 @@ int drm_add_override_edid_modes(struct drm_connector *connector) }EXPORT_SYMBOL (drm_add_override_edid_modes);
Quoted 5 lines
drivers/gpu/drm/drm_edid.c int drm_add_override_edid_modes(struct drm_connector *connector) · line 2041
Quoted 2 lines
drivers/gpu/drm/drm_edid.c +2
-0+typedef int read_block_fn (void *context,u8 *buf,unsigned int block,size_t len); +The header still has the eyesore. Maybe we want to put the typedef there?
Decided to leave that for the future, possibly with a s/u8*/void*/ change.
Thanks,
Jani.
Quoted 53 lines
Reviewed-by Ville Syrjälä <[email protected]>Quoted 50 lines
drivers/gpu/drm/drm_edid.c +7
-9static struct edid *drm_do_get_edid_base_block (struct drm_connector *connector, -int (*get_edid_block)(void *data,u8 *buf,unsigned int block, -size_t len), -void *data) +read_block_fn read_block, +void *context) {int *null_edid_counter = connector ? &connector->null_edid_counter :NULL ;bool *edid_corrupt = connector ? &connector->edid_corrupt :NULL ;@@ -2053,7 +2054,7 @@ static struct edid *drm_do_get_edid_base_block(struct drm_connector *connector,/* base block fetch */ for (try =0 ; try <4 ; try++) { -if (get_edid_block (data, edid,0 ,EDID_LENGTH )) +if (read_block (context, edid,0 ,EDID_LENGTH )) goto out;if (drm_edid_block_valid (edid,0 , false, edid_corrupt))break ;@@ -2097,9 +2098,8 @@ static struct edid *drm_do_get_edid_base_block(struct drm_connector *connector,* Return: Pointer to valid EDID or NULL if we couldn't find any. */ struct edid *drm_do_get_edid (struct drm_connector *connector, -int (*get_edid_block)(void *data,u8 *buf,unsigned int block, -size_t len), -void *data) +read_block_fn read_block, +void *context) {int j, invalid_blocks =0 ;struct edid *edid, *new, *override;@@ -2108,7 +2108,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,if (override)return override; - edid =drm_do_get_edid_base_block (connector, get_edid_block, data); + edid =drm_do_get_edid_base_block (connector, read_block, context);if (!edid)return NULL ;@@ -2125,7 +2125,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,int try;for (try =0 ; try <4 ; try++) { -if (get_edid_block (data, block, j,EDID_LENGTH )) +if (read_block (context, block, j,EDID_LENGTH )) goto out;if (drm_edid_block_valid (block, j, false,NULL ))break ;Signature · 1 line
2.30.2
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Re: [PATCH 03/12] drm/edid: refactor EDID block status printing
In reply to Ville SyrjäläQuoted 55 lines · Ville Syrjälä
Quoted 54 lines · Jani Nikula
Split out a function to log EDID block status. The printouts get changed slightly.
Unfortunately, not all users will have struct
drm_deviceavailable, so we convert to pr_* debug logging instead of drm device based logging.Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/drm_edid.c | 75 ++++++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 24 deletions(-)drivers/gpu/drm/drm_edid.c +35
-0@@ -1729,6 +1729,50 @@ static bool edid_block_valid(const void *block, bool base) edid_block_tag(block)); } +static void edid_block_status_print (enum edid_block_status status, +const struct edid *block, +int block_num) +{ +switch (status) { +case EDID_BLOCK_OK : +break ; +case EDID_BLOCK_NULL : +pr_debug ("EDID block %d pointer is NULL\n" , block_num); +break ; +case EDID_BLOCK_ZERO : +pr_notice ("EDID block %d is all zeroes\n" , block_num); +break ; +case EDID_BLOCK_HEADER_CORRUPT : +pr_notice ("EDID has corrupt header\n" ); +break ; +case EDID_BLOCK_HEADER_REPAIR : +pr_debug ("EDID corrupt header needs repair\n" ); +break ; +case EDID_BLOCK_HEADER_FIXED : +pr_debug ("EDID corrupt header fixed\n" ); +break ; +case EDID_BLOCK_CHECKSUM : +if (edid_block_status_valid (status,edid_block_tag (block))) { +pr_debug ("EDID block %d (tag 0x%02x) checksum is invalid, remainder is %d, ignoring\n" , + block_num,edid_block_tag (block), +edid_block_compute_checksum (block)); + }else { +pr_notice ("EDID block %d (tag 0x%02x) checksum is invalid, remainder is %d\n" , + block_num,edid_block_tag (block), +edid_block_compute_checksum (block)); + } +break ; +case EDID_BLOCK_VERSION : + pr_notice("EDID has major version %d, instead of 1\n",
Quoted 8 lines
drivers/gpu/drm/drm_edid.c static bool edid_block_valid(const void *block, bool base) · line 1771
Quoted 5 lines
drivers/gpu/drm/drm_edid.c +5
-0+ block->version); +break ; +default : +pr_debug ("EDID block %d unknown edid block status code %d\n" , + block_num, status);Maybe this should complaing a bit more loudly. Indicates a bug in the code no?
Sent v2 with WARN().
Thanks,
Jani
Quoted 53 lines
Reviewed-by Ville Syrjälä <[email protected]>Quoted 50 lines
drivers/gpu/drm/drm_edid.c +11
-24+break ; + } +} +/** * drm_edid_block_valid - Sanity check the EDID block (base or extension) * @raw_edid: pointer to raw EDID block @@ -1775,33 +1819,16 @@ bool drm_edid_block_valid(u8 *_block, int block_num, bool print_bad_edid, *edid_corrupt = true; } +edid_block_status_print (status, block, block_num); +/* Determine whether we can use this block with this status. */ valid =edid_block_status_valid (status,edid_block_tag (block)); -/* Some fairly random status printouts. */ -if (status ==EDID_BLOCK_CHECKSUM ) { -if (valid) { -DRM_DEBUG ("EDID block checksum is invalid, remainder is %d\n" , -edid_block_compute_checksum (block)); -DRM_DEBUG ("Assuming a KVM switch modified the block but left the original checksum\n" ); - }else if (print_bad_edid) { -DRM_NOTE ("EDID block checksum is invalid, remainder is %d\n" , -edid_block_compute_checksum (block)); - } - }else if (status ==EDID_BLOCK_VERSION ) { -DRM_NOTE ("EDID has major version %d, instead of 1\n" , - block->version); - } - -if (!valid && print_bad_edid) { -if (status ==EDID_BLOCK_ZERO ) { -pr_notice ("EDID block is all zeroes\n" ); - }else { -pr_notice ("Raw EDID:\n" ); -print_hex_dump (KERN_NOTICE , -" \t" ,DUMP_PREFIX_NONE ,16 ,1 , - block,EDID_LENGTH , false); - } +if (!valid && print_bad_edid && status !=EDID_BLOCK_ZERO ) { +pr_notice ("Raw EDID:\n" ); +print_hex_dump (KERN_NOTICE , +" \t" ,DUMP_PREFIX_NONE ,16 ,1 , + block,EDID_LENGTH , false); }return valid;Signature · 1 line
2.30.2
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Quoted 17 lines · Ville Syrjälä
Quoted 15 lines · Jani Nikula
Ever so slowly moving towards cleaner EDID reading.
Jani Nikula (12):
drm/edid: convertedid_is_zero()toedid_block_is_zero()for blocks drm/edid: haveedid_block_check()detect blocks that are all zero drm/edid: refactor EDID block status printing
drm/edid: add a helper to log dump an EDID block drm/edid: pass struct edid toconnector_bad_edid()drm/edid: add typedef for block read function
drm/edid: abstract an EDID block read helper
drm/edid: use EDID block read helper indrm_do_get_edid()drm/edid: convert extension block read to EDID block read helper drm/edid: drop extra local var
drm/edid: add single point of return todrm_do_get_edid()drm/edid: add EDID block count and size helpers
Quoted 3 lines
Some of the stuff was a bit hard to follow, but I suppose that's mostly an indication of the messy state of the current code. Didn't spot anything obviously wrong at least.
I'm painfully aware. I'm just hoping the end result has more clarity. At least highlights the warts in the logic that I tried to preserve...
Quoted 2 lines
Series is
Reviewed-by Ville Syrjälä <[email protected]>
Again, thanks a bunch!
BR,
Jani.
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/drm_edid.c | 350 ++++++++++++++++++++++++------------- 1 file changed, 225 insertions(+), 125 deletions(-)Signature · 1 line
2.30.2
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center