Changes for DP 1.4 Compliance test 4.2.2.6
Subsystems (4)
cover Changes for DP 1.4 Compliance test 4.2.2.6
Unlike DP 1.2 Compliance test 4.2.2.6, DP 1.4 requires to calculate real CRC value of the last edid data block, and write it back.
Current edid CRC calculate routine adds the last CRC byte, and check if non-zero or not. Need to return the actual CRC value when corruption is detected.
Jerry (Fangzhi) Zuo (2):
drm: Add support for DP 1.4 Compliance edid corruption test 4.2.2.6 drm/amd/display: Hook up drm interface for DP 1.4 edid corruption test
.../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 35 +++++---------------- drivers/gpu/drm/drm_dp_helper.c | 36 ++++++++++++++++++++++ drivers/gpu/drm/drm_edid.c | 15 +++++++-- include/drm/drm_connector.h | 7 +++++ include/drm/drm_dp_helper.h | 3 ++ 5 files changed, 65 insertions(+), 31 deletions(-)
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/2 drm: Add support for DP 1.4 Compliance edid corruption test 4.2.2.6
DP 1.4 edid corruption test requires source DUT to write calculated CRC, not the corrupted CRC from reference sink.
Return the calculated CRC back, and initiate the required sequence.
--- drivers/gpu/drm/drm_dp_helper.c | 36 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/drm_edid.c | 15 ++++++++++++--- include/drm/drm_connector.h | 7 +++++++ include/drm/drm_dp_helper.h | 3 +++ 4 files changed, 58 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_dp_helper.c +36 -0
@@ -336,6 +336,42 @@ int drm_dp_dpcd_read_link_status(struct drm_dp_aux *aux, }EXPORT_SYMBOL (drm_dp_dpcd_read_link_status); +/** +* drm_dp_send_bad_edid_checksum() - send back real edid checksum value +* @aux: DisplayPort AUX channel +* @bad_edid_checksum: real edid checksum for the last block +* +* Returns true on success +*/ +bool drm_dp_send_bad_edid_checksum (struct drm_dp_aux *aux, +u8 bad_edid_checksum) +{ +u8 link_edid_read =0 , auto_test_req =0 ; +u8 test_resp =0 ; + +drm_dp_dpcd_read (aux,DP_DEVICE_SERVICE_IRQ_VECTOR , &auto_test_req,1 ); + auto_test_req &=DP_AUTOMATED_TEST_REQUEST ; + +drm_dp_dpcd_read (aux,DP_TEST_REQUEST , &link_edid_read,1 ); + link_edid_read &=DP_TEST_LINK_EDID_READ ; + +if (!auto_test_req || !link_edid_read) { +DRM_DEBUG_KMS ("Source DUT does not support TEST_EDID_READ\n" ); +return false; + } + +drm_dp_dpcd_write (aux,DP_DEVICE_SERVICE_IRQ_VECTOR , &auto_test_req,1 ); + +/* send back checksum for the last edid extension block data */ +drm_dp_dpcd_write (aux,DP_TEST_EDID_CHECKSUM , &bad_edid_checksum,1 ); + + test_resp |=DP_TEST_EDID_CHECKSUM_WRITE ; +drm_dp_dpcd_write (aux,DP_TEST_RESPONSE , &test_resp,1 ); + +return true; +} +EXPORT_SYMBOL (drm_dp_send_bad_edid_checksum); +/** * drm_dp_link_probe() - probe a DisplayPort link for capabilities * @aux: DisplayPort AUX channel
drivers/gpu/drm/drm_edid.c +12 -3
@@ -1344,13 +1344,19 @@ static void drm_get_displayid(struct drm_connector *connector, struct edid *edid);static int validate_displayid (u8 *displayid,int length,int idx); -static int drm_edid_block_checksum (const u8 *raw_edid) +static int drm_edid_block_checksum (const u8 *raw_edid,bool c) {int i;u8 csum =0 ; -for (i =0 ; i <EDID_LENGTH ; i++) +u8 len; + + len = c ?EDID_LENGTH : (EDID_LENGTH -1 ); + +for (i =0 ; i < len; i++) csum += raw_edid[i]; + csum = c ? csum : (0x100 - csum); +return csum; }
@@ -1408,7 +1414,7 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid, } } - csum =drm_edid_block_checksum (raw_edid); + csum =drm_edid_block_checksum (raw_edid, true);if (csum) {if (edid_corrupt) *edid_corrupt = true;
@@ -1572,6 +1578,9 @@ static void connector_bad_edid(struct drm_connector *connector, prefix,DUMP_PREFIX_NONE ,16 ,1 , block, EDID_LENGTH, false); } + +/* Calculate real checksum for the last edid extension block data */ + connector->bad_edid_checksum =drm_edid_block_checksum (edid + edid[0x7e ] *EDID_LENGTH , false); }/* Get override or firmware EDID */
include/drm/drm_connector.h +7 -0
@@ -1345,6 +1345,13 @@ struct drm_connector {* rev1.1 4.2.2.6 */ bool edid_corrupt; +/** +* @bad_edid_checksum: real edid checksum value for corrupted edid block. +* Required in Displayport 1.4 compliance testing +* rev1.1 4.2.2.6 +*/ +uint8_t bad_edid_checksum; +/** @debugfs_entry: debugfs directory for this connector */ struct dentry *debugfs_entry;
include/drm/drm_dp_helper.h +3 -0
@@ -1383,6 +1383,9 @@ static inline ssize_t drm_dp_dpcd_writeb(struct drm_dp_aux *aux,int drm_dp_dpcd_read_link_status (struct drm_dp_aux *aux,u8 status[DP_LINK_STATUS_SIZE ]); +bool drm_dp_send_bad_edid_checksum (struct drm_dp_aux *aux, +u8 bad_edid_checksum); +/* * DisplayPort link */
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 1/2] drm: Add support for DP 1.4 Compliance edid corruption test 4.2.2.6
Quoted 75 lines · Jerry (Fangzhi) Zuo
DP 1.4 edid corruption test requires source DUT to write calculated CRC, not the corrupted CRC from reference sink.
Return the calculated CRC back, and initiate the required sequence.
Signed-off-by Jerry (Fangzhi) Zuo <[email protected]>--- drivers/gpu/drm/drm_dp_helper.c | 36 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/drm_edid.c | 15 ++++++++++++--- include/drm/drm_connector.h | 7 +++++++ include/drm/drm_dp_helper.h | 3 +++ 4 files changed, 58 insertions(+), 3 deletions(-)drivers/gpu/drm/drm_dp_helper.c +36
-0@@ -336,6 +336,42 @@ int drm_dp_dpcd_read_link_status(struct drm_dp_aux *aux, }EXPORT_SYMBOL (drm_dp_dpcd_read_link_status); +/** +* drm_dp_send_bad_edid_checksum() - send back real edid checksum value +* @aux: DisplayPort AUX channel +* @bad_edid_checksum: real edid checksum for the last block +* +* Returns true on success +*/ +bool drm_dp_send_bad_edid_checksum (struct drm_dp_aux *aux, +u8 bad_edid_checksum) +{ +u8 link_edid_read =0 , auto_test_req =0 ; +u8 test_resp =0 ; + +drm_dp_dpcd_read (aux,DP_DEVICE_SERVICE_IRQ_VECTOR , &auto_test_req,1 ); + auto_test_req &=DP_AUTOMATED_TEST_REQUEST ; + +drm_dp_dpcd_read (aux,DP_TEST_REQUEST , &link_edid_read,1 ); + link_edid_read &=DP_TEST_LINK_EDID_READ ; + +if (!auto_test_req || !link_edid_read) { +DRM_DEBUG_KMS ("Source DUT does not support TEST_EDID_READ\n" ); +return false; + } + +drm_dp_dpcd_write (aux,DP_DEVICE_SERVICE_IRQ_VECTOR , &auto_test_req,1 ); + +/* send back checksum for the last edid extension block data */ +drm_dp_dpcd_write (aux,DP_TEST_EDID_CHECKSUM , &bad_edid_checksum,1 ); + + test_resp |=DP_TEST_EDID_CHECKSUM_WRITE ; +drm_dp_dpcd_write (aux,DP_TEST_RESPONSE , &test_resp,1 ); + +return true; +} +EXPORT_SYMBOL (drm_dp_send_bad_edid_checksum); +/** * drm_dp_link_probe() - probe a DisplayPort link for capabilities * @aux: DisplayPort AUX channel drivers/gpu/drm/drm_edid.c +2
-2@@ -1344,13 +1344,19 @@ static void drm_get_displayid(struct drm_connector *connector, struct edid *edid);static int validate_displayid (u8 *displayid,int length,int idx); -static int drm_edid_block_checksum (const u8 *raw_edid) +static int drm_edid_block_checksum (const u8 *raw_edid,bool c) {int i;u8 csum =0 ; -for (i =0 ; i <EDID_LENGTH ; i++) +u8 len;
drivers/gpu/drm/drm_edid.c static void drm_get_displayid(struct drm_connector *connector, · line 1361
Quoted 10 lines
drivers/gpu/drm/drm_edid.c +6
-0+ + len = c ?EDID_LENGTH : (EDID_LENGTH -1 ); + +for (i =0 ; i < len; i++) csum += raw_edid[i]; + csum = c ? csum : (0x100 - csum); +return csum; }
I think a mysterious boolean 'c' argument just makes this more confusing.
Please split the function to two, one that calculates the checksum (c == false case) and another that uses the function (c == true case). The latter would return the same value as the above.
Please do this as a prep patch without any of the other modifications.
BR,
Jani.
Quoted 52 lines
drivers/gpu/drm/drm_edid.c +4
-1@@ -1408,7 +1414,7 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid, } } - csum =drm_edid_block_checksum (raw_edid); + csum =drm_edid_block_checksum (raw_edid, true);if (csum) {if (edid_corrupt) *edid_corrupt = true;@@ -1572,6 +1578,9 @@ static void connector_bad_edid(struct drm_connector *connector, prefix,DUMP_PREFIX_NONE ,16 ,1 , block, EDID_LENGTH, false); } + +/* Calculate real checksum for the last edid extension block data */ + connector->bad_edid_checksum =drm_edid_block_checksum (edid + edid[0x7e ] *EDID_LENGTH , false); }/* Get override or firmware EDID */ include/drm/drm_connector.h +7
-0@@ -1345,6 +1345,13 @@ struct drm_connector {* rev1.1 4.2.2.6 */ bool edid_corrupt; +/** +* @bad_edid_checksum: real edid checksum value for corrupted edid block. +* Required in Displayport 1.4 compliance testing +* rev1.1 4.2.2.6 +*/ +uint8_t bad_edid_checksum; +/** @debugfs_entry: debugfs directory for this connector */ struct dentry *debugfs_entry;include/drm/drm_dp_helper.h +3
-0@@ -1383,6 +1383,9 @@ static inline ssize_t drm_dp_dpcd_writeb(struct drm_dp_aux *aux,int drm_dp_dpcd_read_link_status (struct drm_dp_aux *aux,u8 status[DP_LINK_STATUS_SIZE ]); +bool drm_dp_send_bad_edid_checksum (struct drm_dp_aux *aux, +u8 bad_edid_checksum); +/* * DisplayPort link */
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 1/2 drm: Add support for DP 1.4 Compliance edid corruption test 4.2.2.6
In reply to a message not in the archiveDP 1.4 edid corruption test requires source DUT to write calculated CRC, not the corrupted CRC from reference sink.
Return the calculated CRC back, and initiate the required sequence.
-v2: Have separate routine for returning real CRC
--- drivers/gpu/drm/drm_dp_helper.c | 36 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/drm_edid.c | 14 ++++++++++++++ include/drm/drm_connector.h | 7 +++++++ include/drm/drm_dp_helper.h | 3 +++ 4 files changed, 60 insertions(+)
drivers/gpu/drm/drm_dp_helper.c +36 -0
@@ -336,6 +336,42 @@ int drm_dp_dpcd_read_link_status(struct drm_dp_aux *aux, }EXPORT_SYMBOL (drm_dp_dpcd_read_link_status); +/** +* drm_dp_send_bad_edid_checksum() - send back real edid checksum value +* @aux: DisplayPort AUX channel +* @bad_edid_checksum: real edid checksum for the last block +* +* Returns true on success +*/ +bool drm_dp_send_bad_edid_checksum (struct drm_dp_aux *aux, +u8 bad_edid_checksum) +{ +u8 link_edid_read =0 , auto_test_req =0 ; +u8 test_resp =0 ; + +drm_dp_dpcd_read (aux,DP_DEVICE_SERVICE_IRQ_VECTOR , &auto_test_req,1 ); + auto_test_req &=DP_AUTOMATED_TEST_REQUEST ; + +drm_dp_dpcd_read (aux,DP_TEST_REQUEST , &link_edid_read,1 ); + link_edid_read &=DP_TEST_LINK_EDID_READ ; + +if (!auto_test_req || !link_edid_read) { +DRM_DEBUG_KMS ("Source DUT does not support TEST_EDID_READ\n" ); +return false; + } + +drm_dp_dpcd_write (aux,DP_DEVICE_SERVICE_IRQ_VECTOR , &auto_test_req,1 ); + +/* send back checksum for the last edid extension block data */ +drm_dp_dpcd_write (aux,DP_TEST_EDID_CHECKSUM , &bad_edid_checksum,1 ); + + test_resp |=DP_TEST_EDID_CHECKSUM_WRITE ; +drm_dp_dpcd_write (aux,DP_TEST_RESPONSE , &test_resp,1 ); + +return true; +} +EXPORT_SYMBOL (drm_dp_send_bad_edid_checksum); +/** * drm_dp_link_probe() - probe a DisplayPort link for capabilities * @aux: DisplayPort AUX channel
drivers/gpu/drm/drm_edid.c +14 -0
@@ -1354,6 +1354,17 @@ static int drm_edid_block_checksum(const u8 *raw_edid)return csum; } +static int drm_edid_block_real_checksum (const u8 *raw_edid) +{ +int i; +u8 csum =0 ; + +for (i =0 ; i <EDID_LENGTH -1 ; i++) + csum += raw_edid[i]; + +return (0x100 - csum); +} +static bool drm_edid_is_zero (const u8 *in_edid,int length) {if (memchr_inv (in_edid,0 , length))
@@ -1572,6 +1583,9 @@ static void connector_bad_edid(struct drm_connector *connector, prefix,DUMP_PREFIX_NONE ,16 ,1 , block, EDID_LENGTH, false); } + +/* Calculate real checksum for the last edid extension block data */ + connector->bad_edid_checksum =drm_edid_block_real_checksum (edid + edid[0x7e ] *EDID_LENGTH ); }/* Get override or firmware EDID */
include/drm/drm_connector.h +7 -0
@@ -1345,6 +1345,13 @@ struct drm_connector {* rev1.1 4.2.2.6 */ bool edid_corrupt; +/** +* @bad_edid_checksum: real edid checksum value for corrupted edid block. +* Required in Displayport 1.4 compliance testing +* rev1.1 4.2.2.6 +*/ +uint8_t bad_edid_checksum; +/** @debugfs_entry: debugfs directory for this connector */ struct dentry *debugfs_entry;
include/drm/drm_dp_helper.h +3 -0
@@ -1383,6 +1383,9 @@ static inline ssize_t drm_dp_dpcd_writeb(struct drm_dp_aux *aux,int drm_dp_dpcd_read_link_status (struct drm_dp_aux *aux,u8 status[DP_LINK_STATUS_SIZE ]); +bool drm_dp_send_bad_edid_checksum (struct drm_dp_aux *aux, +u8 bad_edid_checksum); +/* * DisplayPort link */
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH v2 1/2] drm: Add support for DP 1.4 Compliance edid corruption test 4.2.2.6
Quoted 99 lines · Jerry (Fangzhi) Zuo
DP 1.4 edid corruption test requires source DUT to write calculated CRC, not the corrupted CRC from reference sink.
Return the calculated CRC back, and initiate the required sequence.
-v2: Have separate routine for returning real CRC
Signed-off-by Jerry (Fangzhi) Zuo <[email protected]>--- drivers/gpu/drm/drm_dp_helper.c | 36 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/drm_edid.c | 14 ++++++++++++++ include/drm/drm_connector.h | 7 +++++++ include/drm/drm_dp_helper.h | 3 +++ 4 files changed, 60 insertions(+)drivers/gpu/drm/drm_dp_helper.c +36
-0@@ -336,6 +336,42 @@ int drm_dp_dpcd_read_link_status(struct drm_dp_aux *aux, }EXPORT_SYMBOL (drm_dp_dpcd_read_link_status); +/** +* drm_dp_send_bad_edid_checksum() - send back real edid checksum value +* @aux: DisplayPort AUX channel +* @bad_edid_checksum: real edid checksum for the last block +* +* Returns true on success +*/ +bool drm_dp_send_bad_edid_checksum (struct drm_dp_aux *aux, +u8 bad_edid_checksum) +{ +u8 link_edid_read =0 , auto_test_req =0 ; +u8 test_resp =0 ; + +drm_dp_dpcd_read (aux,DP_DEVICE_SERVICE_IRQ_VECTOR , &auto_test_req,1 ); + auto_test_req &=DP_AUTOMATED_TEST_REQUEST ; + +drm_dp_dpcd_read (aux,DP_TEST_REQUEST , &link_edid_read,1 ); + link_edid_read &=DP_TEST_LINK_EDID_READ ; + +if (!auto_test_req || !link_edid_read) { +DRM_DEBUG_KMS ("Source DUT does not support TEST_EDID_READ\n" ); +return false; + } + +drm_dp_dpcd_write (aux,DP_DEVICE_SERVICE_IRQ_VECTOR , &auto_test_req,1 ); + +/* send back checksum for the last edid extension block data */ +drm_dp_dpcd_write (aux,DP_TEST_EDID_CHECKSUM , &bad_edid_checksum,1 ); + + test_resp |=DP_TEST_EDID_CHECKSUM_WRITE ; +drm_dp_dpcd_write (aux,DP_TEST_RESPONSE , &test_resp,1 ); + +return true; +} +EXPORT_SYMBOL (drm_dp_send_bad_edid_checksum); +/** * drm_dp_link_probe() - probe a DisplayPort link for capabilities * @aux: DisplayPort AUX channel drivers/gpu/drm/drm_edid.c +14
-0@@ -1354,6 +1354,17 @@ static int drm_edid_block_checksum(const u8 *raw_edid)return csum; } +static int drm_edid_block_real_checksum (const u8 *raw_edid) +{ +int i; +u8 csum =0 ; + +for (i =0 ; i <EDID_LENGTH -1 ; i++) + csum += raw_edid[i]; + +return (0x100 - csum); +} +static bool drm_edid_is_zero (const u8 *in_edid,int length) {if (memchr_inv (in_edid,0 , length))@@ -1572,6 +1583,9 @@ static void connector_bad_edid(struct drm_connector *connector, prefix,DUMP_PREFIX_NONE ,16 ,1 , block, EDID_LENGTH, false); } + +/* Calculate real checksum for the last edid extension block data */ + connector->bad_edid_checksum =drm_edid_block_real_checksum (edid + edid[0x7e ] *EDID_LENGTH ); }/* Get override or firmware EDID */ include/drm/drm_connector.h +0
-0
include/drm/drm_connector.h struct drm_connector { · line 1353
Quoted 9 lines
include/drm/drm_connector.h +6
-0@@ -1345,6 +1345,13 @@ struct drm_connector {* rev1.1 4.2.2.6 */ bool edid_corrupt; +/** +* @bad_edid_checksum: real edid checksum value for corrupted edid block. +* Required in Displayport 1.4 compliance testing +* rev1.1 4.2.2.6 +*/ +uint8_t bad_edid_checksum;
This variable name confused me a bit. Maybe name this "computed_edid_checksum" to clarify that this is the EDID checksum that we've computed for the EDID, i.e. the correct one.
include/drm/drm_dp_helper.h static inline ssize_t drm_dp_dpcd_writeb(struct drm_dp_aux *aux, · line 1386
Quoted 13 lines
include/drm/drm_connector.h +1
-0+/** @debugfs_entry: debugfs directory for this connector */ struct dentry *debugfs_entry;include/drm/drm_dp_helper.h +1
-0@@ -1383,6 +1383,9 @@ static inline ssize_t drm_dp_dpcd_writeb(struct drm_dp_aux *aux,int drm_dp_dpcd_read_link_status (struct drm_dp_aux *aux,u8 status[DP_LINK_STATUS_SIZE ]); +bool drm_dp_send_bad_edid_checksum(struct drm_dp_aux *aux,
Same as before, might be good to name this drm_dp_send_computed_edid_checksum or something similar.
Harry
include/drm/drm_dp_helper.h static inline ssize_t drm_dp_dpcd_writeb(struct drm_dp_aux *aux, · line 1391
Quoted 6 lines
include/drm/drm_dp_helper.h +2
-0+ u8 bad_edid_checksum); +/* * DisplayPort link */
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH v2 1/2] drm: Add support for DP 1.4 Compliance edid corruption test 4.2.2.6
In reply to Jerry (Fangzhi) ZuoQuoted 69 lines · Jerry (Fangzhi) Zuo
DP 1.4 edid corruption test requires source DUT to write calculated CRC, not the corrupted CRC from reference sink.
Return the calculated CRC back, and initiate the required sequence.
-v2: Have separate routine for returning real CRC
Signed-off-by Jerry (Fangzhi) Zuo <[email protected]>--- drivers/gpu/drm/drm_dp_helper.c | 36 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/drm_edid.c | 14 ++++++++++++++ include/drm/drm_connector.h | 7 +++++++ include/drm/drm_dp_helper.h | 3 +++ 4 files changed, 60 insertions(+)drivers/gpu/drm/drm_dp_helper.c +36
-0@@ -336,6 +336,42 @@ int drm_dp_dpcd_read_link_status(struct drm_dp_aux *aux, }EXPORT_SYMBOL (drm_dp_dpcd_read_link_status); +/** +* drm_dp_send_bad_edid_checksum() - send back real edid checksum value +* @aux: DisplayPort AUX channel +* @bad_edid_checksum: real edid checksum for the last block +* +* Returns true on success +*/ +bool drm_dp_send_bad_edid_checksum (struct drm_dp_aux *aux, +u8 bad_edid_checksum) +{ +u8 link_edid_read =0 , auto_test_req =0 ; +u8 test_resp =0 ; + +drm_dp_dpcd_read (aux,DP_DEVICE_SERVICE_IRQ_VECTOR , &auto_test_req,1 ); + auto_test_req &=DP_AUTOMATED_TEST_REQUEST ; + +drm_dp_dpcd_read (aux,DP_TEST_REQUEST , &link_edid_read,1 ); + link_edid_read &=DP_TEST_LINK_EDID_READ ; + +if (!auto_test_req || !link_edid_read) { +DRM_DEBUG_KMS ("Source DUT does not support TEST_EDID_READ\n" ); +return false; + } + +drm_dp_dpcd_write (aux,DP_DEVICE_SERVICE_IRQ_VECTOR , &auto_test_req,1 ); + +/* send back checksum for the last edid extension block data */ +drm_dp_dpcd_write (aux,DP_TEST_EDID_CHECKSUM , &bad_edid_checksum,1 ); + + test_resp |=DP_TEST_EDID_CHECKSUM_WRITE ; +drm_dp_dpcd_write (aux,DP_TEST_RESPONSE , &test_resp,1 ); + +return true; +} +EXPORT_SYMBOL (drm_dp_send_bad_edid_checksum); +/** * drm_dp_link_probe() - probe a DisplayPort link for capabilities * @aux: DisplayPort AUX channel drivers/gpu/drm/drm_edid.c +0
-0@@ -1354,6 +1354,17 @@ static int drm_edid_block_checksum(const u8 *raw_edid)return csum; }
drivers/gpu/drm/drm_edid.c static int drm_edid_block_checksum(const u8 *raw_edid) · line 1365
Quoted 10 lines
drivers/gpu/drm/drm_edid.c +9
-0+static int drm_edid_block_real_checksum (const u8 *raw_edid) +{ +int i; +u8 csum =0 ; + +for (i =0 ; i <EDID_LENGTH -1 ; i++) + csum += raw_edid[i]; + +return (0x100 - csum);
Now you have two functions that have the loop to calculate checksums, which is not at all what I tried to tell you to do.
I tried to suggest something like this:
static int drm_edid_block_checksum(const u8 *raw_edid)
{
int i;
u8 csum = 0;
for (i = 0; i < EDID_LENGTH - 1; i++)
csum += raw_edid[i];
return 0x100 - csum;
}static int drm_edid_block_checksum_diff(const u8 *raw_edid)
{
u8 csum = drm_edid_block_checksum(raw_edid) + raw_edid[EDID_LENGTH - 1];
return csum;
}Alternatively, you could have just the function to calculate the checksum, and then the check is comparing the calculated checksum against the checksum in the EDID.
BR,
Jani.
Quoted 47 lines
drivers/gpu/drm/drm_edid.c +5
-0+} +static bool drm_edid_is_zero (const u8 *in_edid,int length) {if (memchr_inv (in_edid,0 , length))@@ -1572,6 +1583,9 @@ static void connector_bad_edid(struct drm_connector *connector, prefix,DUMP_PREFIX_NONE ,16 ,1 , block, EDID_LENGTH, false); } + +/* Calculate real checksum for the last edid extension block data */ + connector->bad_edid_checksum =drm_edid_block_real_checksum (edid + edid[0x7e ] *EDID_LENGTH ); }/* Get override or firmware EDID */ include/drm/drm_connector.h +7
-0@@ -1345,6 +1345,13 @@ struct drm_connector {* rev1.1 4.2.2.6 */ bool edid_corrupt; +/** +* @bad_edid_checksum: real edid checksum value for corrupted edid block. +* Required in Displayport 1.4 compliance testing +* rev1.1 4.2.2.6 +*/ +uint8_t bad_edid_checksum; +/** @debugfs_entry: debugfs directory for this connector */ struct dentry *debugfs_entry;include/drm/drm_dp_helper.h +3
-0@@ -1383,6 +1383,9 @@ static inline ssize_t drm_dp_dpcd_writeb(struct drm_dp_aux *aux,int drm_dp_dpcd_read_link_status (struct drm_dp_aux *aux,u8 status[DP_LINK_STATUS_SIZE ]); +bool drm_dp_send_bad_edid_checksum (struct drm_dp_aux *aux, +u8 bad_edid_checksum); +/* * DisplayPort link */
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 1/1 drm: Add support for DP 1.4 Compliance edid corruption test 4.2.2.6
In reply to Jerry (Fangzhi) ZuoDP 1.4 edid corruption test requires source DUT to write calculated CRC, not the corrupted CRC from reference sink.
Return the calculated CRC back, and initiate the required sequence.
-v2: Have separate routine for returning real CRC
-v3: Rewrite checksum computation routine to avoid duplicated code.
Rename to avoid confusion
--- drivers/gpu/drm/drm_dp_helper.c | 36 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/drm_edid.c | 18 +++++++++++++++--- include/drm/drm_connector.h | 7 +++++++ include/drm/drm_dp_helper.h | 3 +++ 4 files changed, 61 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_dp_helper.c +36 -0
@@ -336,6 +336,42 @@ int drm_dp_dpcd_read_link_status(struct drm_dp_aux *aux, }EXPORT_SYMBOL (drm_dp_dpcd_read_link_status); +/** +* drm_dp_send_real_edid_checksum() - send back real edid checksum value +* @aux: DisplayPort AUX channel +* @bad_edid_checksum: real edid checksum for the last block +* +* Returns true on success +*/ +bool drm_dp_send_real_edid_checksum (struct drm_dp_aux *aux, +u8 real_edid_checksum) +{ +u8 link_edid_read =0 , auto_test_req =0 ; +u8 test_resp =0 ; + +drm_dp_dpcd_read (aux,DP_DEVICE_SERVICE_IRQ_VECTOR , &auto_test_req,1 ); + auto_test_req &=DP_AUTOMATED_TEST_REQUEST ; + +drm_dp_dpcd_read (aux,DP_TEST_REQUEST , &link_edid_read,1 ); + link_edid_read &=DP_TEST_LINK_EDID_READ ; + +if (!auto_test_req || !link_edid_read) { +DRM_DEBUG_KMS ("Source DUT does not support TEST_EDID_READ\n" ); +return false; + } + +drm_dp_dpcd_write (aux,DP_DEVICE_SERVICE_IRQ_VECTOR , &auto_test_req,1 ); + +/* send back checksum for the last edid extension block data */ +drm_dp_dpcd_write (aux,DP_TEST_EDID_CHECKSUM , &real_edid_checksum,1 ); + + test_resp |=DP_TEST_EDID_CHECKSUM_WRITE ; +drm_dp_dpcd_write (aux,DP_TEST_RESPONSE , &test_resp,1 ); + +return true; +} +EXPORT_SYMBOL (drm_dp_send_real_edid_checksum); +/** * drm_dp_link_probe() - probe a DisplayPort link for capabilities * @aux: DisplayPort AUX channel
drivers/gpu/drm/drm_edid.c +15 -3
@@ -1348,10 +1348,19 @@ static int drm_edid_block_checksum(const u8 *raw_edid) {int i;u8 csum =0 ; -for (i =0 ; i <EDID_LENGTH ; i++) + +for (i =0 ; i <EDID_LENGTH -1 ; i++) csum += raw_edid[i]; -return csum; +return (0x100 - csum); +} + +static bool drm_edid_block_checksum_diff (const u8 *raw_edid,u8 real_checksum) +{ +if (raw_edid[EDID_LENGTH -1 ] != real_checksum) +return true; +else +return false; }static bool drm_edid_is_zero (const u8 *in_edid,int length)
@@ -1409,7 +1418,7 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid, } csum =drm_edid_block_checksum (raw_edid); -if (csum) { +if (drm_edid_block_checksum_diff (raw_edid, csum)) {if (edid_corrupt) *edid_corrupt = true;
@@ -1572,6 +1581,9 @@ static void connector_bad_edid(struct drm_connector *connector, prefix,DUMP_PREFIX_NONE ,16 ,1 , block, EDID_LENGTH, false); } + +/* Calculate real checksum for the last edid extension block data */ + connector->real_edid_checksum =drm_edid_block_checksum (edid + edid[0x7e ] *EDID_LENGTH ); }/* Get override or firmware EDID */
include/drm/drm_connector.h +7 -0
@@ -1345,6 +1345,13 @@ struct drm_connector {* rev1.1 4.2.2.6 */ bool edid_corrupt; +/** +* @real_edid_checksum: real edid checksum value for corrupted edid block. +* Required in Displayport 1.4 compliance testing +* rev1.1 4.2.2.6 +*/ +uint8_t real_edid_checksum; +/** @debugfs_entry: debugfs directory for this connector */ struct dentry *debugfs_entry;
include/drm/drm_dp_helper.h +3 -0
@@ -1383,6 +1383,9 @@ static inline ssize_t drm_dp_dpcd_writeb(struct drm_dp_aux *aux,int drm_dp_dpcd_read_link_status (struct drm_dp_aux *aux,u8 status[DP_LINK_STATUS_SIZE ]); +bool drm_dp_send_real_edid_checksum (struct drm_dp_aux *aux, +u8 real_edid_checksum); +/* * DisplayPort link */
Signature · 6 lines
2.14.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v4 1/1 drm: Add support for DP 1.4 Compliance edid corruption test 4.2.2.6
DP 1.4 edid corruption test requires source DUT to write calculated CRC, not the corrupted CRC from reference sink.
Return the calculated CRC back, and initiate the required sequence.
-v2: Have separate routine for returning real CRC
-v3: Rewrite checksum computation routine to avoid duplicated code.
Rename to avoid confusion
-v4: Fix a minor typo.
--- drivers/gpu/drm/drm_dp_helper.c | 36 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/drm_edid.c | 18 +++++++++++++++--- include/drm/drm_connector.h | 7 +++++++ include/drm/drm_dp_helper.h | 3 +++ 4 files changed, 61 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_dp_helper.c +36 -0
@@ -336,6 +336,42 @@ int drm_dp_dpcd_read_link_status(struct drm_dp_aux *aux, }EXPORT_SYMBOL (drm_dp_dpcd_read_link_status); +/** +* drm_dp_send_real_edid_checksum() - send back real edid checksum value +* @aux: DisplayPort AUX channel +* @real_edid_checksum: real edid checksum for the last block +* +* Returns true on success +*/ +bool drm_dp_send_real_edid_checksum (struct drm_dp_aux *aux, +u8 real_edid_checksum) +{ +u8 link_edid_read =0 , auto_test_req =0 ; +u8 test_resp =0 ; + +drm_dp_dpcd_read (aux,DP_DEVICE_SERVICE_IRQ_VECTOR , &auto_test_req,1 ); + auto_test_req &=DP_AUTOMATED_TEST_REQUEST ; + +drm_dp_dpcd_read (aux,DP_TEST_REQUEST , &link_edid_read,1 ); + link_edid_read &=DP_TEST_LINK_EDID_READ ; + +if (!auto_test_req || !link_edid_read) { +DRM_DEBUG_KMS ("Source DUT does not support TEST_EDID_READ\n" ); +return false; + } + +drm_dp_dpcd_write (aux,DP_DEVICE_SERVICE_IRQ_VECTOR , &auto_test_req,1 ); + +/* send back checksum for the last edid extension block data */ +drm_dp_dpcd_write (aux,DP_TEST_EDID_CHECKSUM , &real_edid_checksum,1 ); + + test_resp |=DP_TEST_EDID_CHECKSUM_WRITE ; +drm_dp_dpcd_write (aux,DP_TEST_RESPONSE , &test_resp,1 ); + +return true; +} +EXPORT_SYMBOL (drm_dp_send_real_edid_checksum); +/** * drm_dp_link_probe() - probe a DisplayPort link for capabilities * @aux: DisplayPort AUX channel
drivers/gpu/drm/drm_edid.c +15 -3
@@ -1348,10 +1348,19 @@ static int drm_edid_block_checksum(const u8 *raw_edid) {int i;u8 csum =0 ; -for (i =0 ; i <EDID_LENGTH ; i++) + +for (i =0 ; i <EDID_LENGTH -1 ; i++) csum += raw_edid[i]; -return csum; +return (0x100 - csum); +} + +static bool drm_edid_block_checksum_diff (const u8 *raw_edid,u8 real_checksum) +{ +if (raw_edid[EDID_LENGTH -1 ] != real_checksum) +return true; +else +return false; }static bool drm_edid_is_zero (const u8 *in_edid,int length)
@@ -1409,7 +1418,7 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid, } csum =drm_edid_block_checksum (raw_edid); -if (csum) { +if (drm_edid_block_checksum_diff (raw_edid, csum)) {if (edid_corrupt) *edid_corrupt = true;
@@ -1572,6 +1581,9 @@ static void connector_bad_edid(struct drm_connector *connector, prefix,DUMP_PREFIX_NONE ,16 ,1 , block, EDID_LENGTH, false); } + +/* Calculate real checksum for the last edid extension block data */ + connector->real_edid_checksum =drm_edid_block_checksum (edid + edid[0x7e ] *EDID_LENGTH ); }/* Get override or firmware EDID */
include/drm/drm_connector.h +7 -0
@@ -1345,6 +1345,13 @@ struct drm_connector {* rev1.1 4.2.2.6 */ bool edid_corrupt; +/** +* @real_edid_checksum: real edid checksum value for corrupted edid block. +* Required in Displayport 1.4 compliance testing +* rev1.1 4.2.2.6 +*/ +uint8_t real_edid_checksum; +/** @debugfs_entry: debugfs directory for this connector */ struct dentry *debugfs_entry;
include/drm/drm_dp_helper.h +3 -0
@@ -1383,6 +1383,9 @@ static inline ssize_t drm_dp_dpcd_writeb(struct drm_dp_aux *aux,int drm_dp_dpcd_read_link_status (struct drm_dp_aux *aux,u8 status[DP_LINK_STATUS_SIZE ]); +bool drm_dp_send_real_edid_checksum (struct drm_dp_aux *aux, +u8 real_edid_checksum); +/* * DisplayPort link */
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
RE: [PATCH v4] drm: Add support for DP 1.4 Compliance edid corruption test 4.2.2.6
Please kindly give a review on my latest revision. Thanks a lot.
Regards,
Jerry
-----Original Message-----
From: Jerry (Fangzhi) Zuo <[email protected]>
Sent: November 5, 2019 11:38 AM
To: [email protected]; [email protected]
Cc: [email protected]; [email protected]; Wentland, Harry <[email protected]>; Zuo, Jerry <[email protected]>
Subject: [PATCH v4] drm: Add support for DP 1.4 Compliance edid corruption test 4.2.2.6
DP 1.4 edid corruption test requires source DUT to write calculated CRC, not the corrupted CRC from reference sink.
Return the calculated CRC back, and initiate the required sequence.
-v2: Have separate routine for returning real CRC
-v3: Rewrite checksum computation routine to avoid duplicated code.
Rename to avoid confusion
-v4: Fix a minor typo.
--- drivers/gpu/drm/drm_dp_helper.c | 36 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/drm_edid.c | 18 +++++++++++++++--- include/drm/drm_connector.h | 7 +++++++ include/drm/drm_dp_helper.h | 3 +++ 4 files changed, 61 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_dp_helper.c +38 -0
@@ -336,6 +336,42 @@ int drm_dp_dpcd_read_link_status(struct drm_dp_aux *aux, } EXPORT_SYMBOL(drm_dp_dpcd_read_link_status); +/** +* drm_dp_send_real_edid_checksum() - send back real edid checksum +value +* @aux: DisplayPort AUX channel +* @real_edid_checksum: real edid checksum for the last block +* +* Returns true on success +*/ +bool drm_dp_send_real_edid_checksum (struct drm_dp_aux *aux, +u8 real_edid_checksum) { +u8 link_edid_read =0 , auto_test_req =0 ; +u8 test_resp =0 ; + +drm_dp_dpcd_read (aux,DP_DEVICE_SERVICE_IRQ_VECTOR , &auto_test_req,1 ); + auto_test_req &=DP_AUTOMATED_TEST_REQUEST ; + +drm_dp_dpcd_read (aux,DP_TEST_REQUEST , &link_edid_read,1 ); + link_edid_read &=DP_TEST_LINK_EDID_READ ; + +if (!auto_test_req || !link_edid_read) { +DRM_DEBUG_KMS ("Source DUT does not support TEST_EDID_READ\n" ); +return false; + } + +drm_dp_dpcd_write (aux,DP_DEVICE_SERVICE_IRQ_VECTOR , + &auto_test_req,1 ); + +/* send back checksum for the last edid extension block data */ +drm_dp_dpcd_write (aux,DP_TEST_EDID_CHECKSUM , + &real_edid_checksum,1 ); + + test_resp |=DP_TEST_EDID_CHECKSUM_WRITE ; +drm_dp_dpcd_write (aux,DP_TEST_RESPONSE , &test_resp,1 ); + +return true; +} +EXPORT_SYMBOL (drm_dp_send_real_edid_checksum); +/** * drm_dp_link_probe() - probe a DisplayPort link for capabilities * @aux: DisplayPort AUX channel
drivers/gpu/drm/drm_edid.c +11 -2
@@ -1348,10 +1348,19 @@ static int drm_edid_block_checksum(const u8 *raw_edid) {int i;u8 csum =0 ; -for (i =0 ; i <EDID_LENGTH ; i++) + +for (i =0 ; i <EDID_LENGTH -1 ; i++) csum += raw_edid[i]; -return csum; +return (0x100 - csum); +} + +static bool drm_edid_block_checksum_diff (const u8 *raw_edid,u8 +real_checksum) { +if (raw_edid[EDID_LENGTH -1 ] != real_checksum) +return true; +else +return false; } static bool drm_edid_is_zero(const u8 *in_edid, int length) @@ -1409,7 +1418,7 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid, }
csum = drm_edid_block_checksum(raw_edid);
- if (csum) {
+ if (drm_edid_block_checksum_diff(raw_edid, csum)) {
if (edid_corrupt)
*edid_corrupt = true;
@@ -1572,6 +1581,9 @@ static void connector_bad_edid(struct drm_connector *connector,
prefix, DUMP_PREFIX_NONE, 16, 1,
block, EDID_LENGTH, false);
}
+
+ /* Calculate real checksum for the last edid extension block data */
+ connector->real_edid_checksum = drm_edid_block_checksum(edid +
+edid[0x7e] * EDID_LENGTH);
}
/* Get override or firmware EDID */
include/drm/drm_connector.h +7 -0
@@ -1345,6 +1345,13 @@ struct drm_connector {* rev1.1 4.2.2.6 */ bool edid_corrupt; +/** +* @real_edid_checksum: real edid checksum value for corrupted edid block. +* Required in Displayport 1.4 compliance testing +* rev1.1 4.2.2.6 +*/ +uint8_t real_edid_checksum; +/** @debugfs_entry: debugfs directory for this connector */ struct dentry *debugfs_entry;
include/drm/drm_dp_helper.h +3 -1
@@ -1383,6 +1383,9 @@ static inline ssize_t drm_dp_dpcd_writeb(struct drm_dp_aux *aux, int drm_dp_dpcd_read_link_status(struct drm_dp_aux *aux, u8 status[DP_LINK_STATUS_SIZE]); +bool drm_dp_send_real_edid_checksum (struct drm_dp_aux *aux, +u8 real_edid_checksum); +/* * DisplayPort link */ --
2.14.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): DM5PR12MB1705A4E4102731AF4BDB00CDE54A0-2J9CzHegvk9755J/[email protected]
Harry Wentland
Reviewed-byRe: [PATCH v4] drm: Add support for DP 1.4 Compliance edid corruption test 4.2.2.6
Quoted 2 lines · Jerry
Please kindly give a review on my latest revision. Thanks a lot.
Both patches are
Harry
Quoted 148 lines
Regards,
Jerry-----Original Message-----
From: Jerry (Fangzhi) Zuo <[email protected]>
Sent: November 5, 2019 11:38 AM
To: [email protected]; [email protected]
Cc: [email protected]; [email protected]; Wentland, Harry <[email protected]>; Zuo, Jerry <[email protected]>
Subject: [PATCH v4] drm: Add support for DP 1.4 Compliance edid corruption test 4.2.2.6DP 1.4 edid corruption test requires source DUT to write calculated CRC, not the corrupted CRC from reference sink.
Return the calculated CRC back, and initiate the required sequence.
(quoted diff) +0
-3-v2: Have separate routine for returning real CRC -v3: Rewrite checksum computation routine to avoid duplicated code. Rename to avoid confusion -v4: Fix a minor typo.Signed-off-by Jerry (Fangzhi) Zuo <[email protected]>--- drivers/gpu/drm/drm_dp_helper.c | 36 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/drm_edid.c | 18 +++++++++++++++--- include/drm/drm_connector.h | 7 +++++++ include/drm/drm_dp_helper.h | 3 +++ 4 files changed, 61 insertions(+), 3 deletions(-)drivers/gpu/drm/drm_dp_helper.c +38
-0@@ -336,6 +336,42 @@ int drm_dp_dpcd_read_link_status(struct drm_dp_aux *aux, } EXPORT_SYMBOL(drm_dp_dpcd_read_link_status); +/** +* drm_dp_send_real_edid_checksum() - send back real edid checksum +value +* @aux: DisplayPort AUX channel +* @real_edid_checksum: real edid checksum for the last block +* +* Returns true on success +*/ +bool drm_dp_send_real_edid_checksum (struct drm_dp_aux *aux, +u8 real_edid_checksum) { +u8 link_edid_read =0 , auto_test_req =0 ; +u8 test_resp =0 ; + +drm_dp_dpcd_read (aux,DP_DEVICE_SERVICE_IRQ_VECTOR , &auto_test_req,1 ); + auto_test_req &=DP_AUTOMATED_TEST_REQUEST ; + +drm_dp_dpcd_read (aux,DP_TEST_REQUEST , &link_edid_read,1 ); + link_edid_read &=DP_TEST_LINK_EDID_READ ; + +if (!auto_test_req || !link_edid_read) { +DRM_DEBUG_KMS ("Source DUT does not support TEST_EDID_READ\n" ); +return false; + } + +drm_dp_dpcd_write (aux,DP_DEVICE_SERVICE_IRQ_VECTOR , + &auto_test_req,1 ); + +/* send back checksum for the last edid extension block data */ +drm_dp_dpcd_write (aux,DP_TEST_EDID_CHECKSUM , + &real_edid_checksum,1 ); + + test_resp |=DP_TEST_EDID_CHECKSUM_WRITE ; +drm_dp_dpcd_write (aux,DP_TEST_RESPONSE , &test_resp,1 ); + +return true; +} +EXPORT_SYMBOL (drm_dp_send_real_edid_checksum); +/** * drm_dp_link_probe() - probe a DisplayPort link for capabilities * @aux: DisplayPort AUX channel drivers/gpu/drm/drm_edid.c +11
-2@@ -1348,10 +1348,19 @@ static int drm_edid_block_checksum(const u8 *raw_edid) {int i;u8 csum =0 ; -for (i =0 ; i <EDID_LENGTH ; i++) + +for (i =0 ; i <EDID_LENGTH -1 ; i++) csum += raw_edid[i]; -return csum; +return (0x100 - csum); +} + +static bool drm_edid_block_checksum_diff (const u8 *raw_edid,u8 +real_checksum) { +if (raw_edid[EDID_LENGTH -1 ] != real_checksum) +return true; +else +return false; } static bool drm_edid_is_zero(const u8 *in_edid, int length) @@ -1409,7 +1418,7 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid, }drivers/gpu/drm/drm_edid.c +5
-1csum =drm_edid_block_checksum (raw_edid); -if (csum) { +if (drm_edid_block_checksum_diff (raw_edid, csum)) {if (edid_corrupt) *edid_corrupt = true;@@ -1572,6 +1581,9 @@ static void connector_bad_edid(struct drm_connector *connector, prefix,DUMP_PREFIX_NONE ,16 ,1 , block, EDID_LENGTH, false); } + +/* Calculate real checksum for the last edid extension block data */ + connector->real_edid_checksum =drm_edid_block_checksum (edid + +edid[0x7e ] *EDID_LENGTH ); }/* Get override or firmware EDID */ include/drm/drm_connector.h +7
-0@@ -1345,6 +1345,13 @@ struct drm_connector {* rev1.1 4.2.2.6 */ bool edid_corrupt; +/** +* @real_edid_checksum: real edid checksum value for corrupted edid block. +* Required in Displayport 1.4 compliance testing +* rev1.1 4.2.2.6 +*/ +uint8_t real_edid_checksum; +/** @debugfs_entry: debugfs directory for this connector */ struct dentry *debugfs_entry;include/drm/drm_dp_helper.h +3
-1@@ -1383,6 +1383,9 @@ static inline ssize_t drm_dp_dpcd_writeb(struct drm_dp_aux *aux, int drm_dp_dpcd_read_link_status(struct drm_dp_aux *aux, u8 status[DP_LINK_STATUS_SIZE]); +bool drm_dp_send_real_edid_checksum (struct drm_dp_aux *aux, +u8 real_edid_checksum); +/* * DisplayPort link */ --
Quoted 2 lines
2.14.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amd/display: Hook up drm interface for DP 1.4 edid corruption test
In reply to a message not in the archive--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 35 +++++----------------- 1 file changed, 7 insertions(+), 28 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +7 -28
@@ -575,6 +575,7 @@ enum dc_edid_status dm_helpers_read_local_edid( struct dc_sink *sink) {struct amdgpu_dm_connector *aconnector = link->priv; +struct drm_connector *connector = &aconnector->base;struct i2c_adapter *ddc;int retry =3 ;enum dc_edid_status edid_status;
@@ -592,6 +593,12 @@ enum dc_edid_status dm_helpers_read_local_edid( edid =drm_get_edid (&aconnector->base, ddc); +if (link->aux_mode && connector->edid_corrupt) +drm_dp_send_bad_edid_checksum (&aconnector->dm_dp_aux.aux, connector->bad_edid_checksum); + +if (!edid && connector->edid_corrupt) +return EDID_BAD_CHECKSUM ; +if (!edid)return EDID_NO_RESPONSE ;
@@ -612,34 +619,6 @@ enum dc_edid_status dm_helpers_read_local_edid(DRM_ERROR ("EDID err: %d, on connector: %s" , edid_status, aconnector->base.name); -if (link->aux_mode) { -union test_request test_request = { {0 } }; -union test_response test_response = { {0 } }; - -dm_helpers_dp_read_dpcd (ctx, - link, -DP_TEST_REQUEST , - &test_request.raw, -sizeof (union test_request )); - -if (!test_request.bits.EDID_READ) -return edid_status; - - test_response.bits.EDID_CHECKSUM_WRITE =1 ; - -dm_helpers_dp_write_dpcd (ctx, - link, -DP_TEST_EDID_CHECKSUM , - &sink->dc_edid.raw_edid[sink->dc_edid.length-1 ], -1 ); - -dm_helpers_dp_write_dpcd (ctx, - link, -DP_TEST_RESPONSE , - &test_response.raw, -sizeof (test_response)); - - }return edid_status; }
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v2 1/1 drm/amd/display: Hook up drm interface for DP 1.4 edid corruption test
-v3: Rename to avoid confusion
--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 35 +++++----------------- 1 file changed, 7 insertions(+), 28 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +7 -28
@@ -575,6 +575,7 @@ enum dc_edid_status dm_helpers_read_local_edid( struct dc_sink *sink) {struct amdgpu_dm_connector *aconnector = link->priv; +struct drm_connector *connector = &aconnector->base;struct i2c_adapter *ddc;int retry =3 ;enum dc_edid_status edid_status;
@@ -592,6 +593,12 @@ enum dc_edid_status dm_helpers_read_local_edid( edid =drm_get_edid (&aconnector->base, ddc); +if (link->aux_mode && connector->edid_corrupt) +drm_dp_send_real_edid_checksum (&aconnector->dm_dp_aux.aux, connector->real_edid_checksum); + +if (!edid && connector->edid_corrupt) +return EDID_BAD_CHECKSUM ; +if (!edid)return EDID_NO_RESPONSE ;
@@ -612,34 +619,6 @@ enum dc_edid_status dm_helpers_read_local_edid(DRM_ERROR ("EDID err: %d, on connector: %s" , edid_status, aconnector->base.name); -if (link->aux_mode) { -union test_request test_request = { {0 } }; -union test_response test_response = { {0 } }; - -dm_helpers_dp_read_dpcd (ctx, - link, -DP_TEST_REQUEST , - &test_request.raw, -sizeof (union test_request )); - -if (!test_request.bits.EDID_READ) -return edid_status; - - test_response.bits.EDID_CHECKSUM_WRITE =1 ; - -dm_helpers_dp_write_dpcd (ctx, - link, -DP_TEST_EDID_CHECKSUM , - &sink->dc_edid.raw_edid[sink->dc_edid.length-1 ], -1 ); - -dm_helpers_dp_write_dpcd (ctx, - link, -DP_TEST_RESPONSE , - &test_response.raw, -sizeof (test_response)); - - }return edid_status; }
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx