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.
[For CI]
Resend this patchset to intel gfx CI.
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 | 18 +++++++++-- include/drm/drm_connector.h | 7 +++++ include/drm/drm_dp_helper.h | 3 ++ 5 files changed, 68 insertions(+), 31 deletions(-)
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH RESEND 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.
-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
PATCH RESEND 2/2 drm/amd/display: Hook up drm interface for DP 1.4 edid corruption test
In reply to Jerry (Fangzhi) Zuo-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
Patchwork
CI✗ Fi.CI.BUILD: failure for Changes for DP 1.4 Compliance test 4.2.2.6
In reply to Jerry (Fangzhi) Zuo== Series Details ==
== Series Details ==
Series: Changes for DP 1.4 Compliance test 4.2.2.6
URL : https://patchwork.freedesktop.org/series/70314/
State : failure
== Summary ==
Applying: drm: Add support for DP 1.4 Compliance edid corruption test 4.2.2.6
error: sha1 information is lacking or useless (include/drm/drm_dp_helper.h).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 drm: Add support for DP 1.4 Compliance edid corruption test 4.2.2.6 When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx