drm/i915/dp: do not proceed with autotests if we don't ACK them
Subsystems (2)
PATCH 1/1 drm/i915/dp: do not proceed with autotests if we don't ACK them
There is no point in setting intel_dp->compliance.test_type, and proceeding with the autotests, if we're about to NAK the request. Some drive-by cleanups while at it.
--- drivers/gpu/drm/i915/intel_dp.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +9 -12
@@ -3985,45 +3985,42 @@ static uint8_t intel_dp_autotest_phy_pattern(struct intel_dp *intel_dp)static void intel_dp_handle_test_request (struct intel_dp *intel_dp) {uint8_t response =DP_TEST_NAK ; -uint8_t rxdata =0 ; -int status =0 ; +uint8_t request =0 ; +int status; - status =drm_dp_dpcd_read (&intel_dp->aux,DP_TEST_REQUEST , &rxdata,1 ); + status =drm_dp_dpcd_readb (&intel_dp->aux,DP_TEST_REQUEST , &request);if (status <=0 ) {DRM_DEBUG_KMS ("Could not read test request from sink\n" ); goto update_status; } -switch (rxdata) { +switch (request) {case DP_TEST_LINK_TRAINING :DRM_DEBUG_KMS ("LINK_TRAINING test requested\n" ); - intel_dp->compliance.test_type =DP_TEST_LINK_TRAINING ; response =intel_dp_autotest_link_training (intel_dp);break ;case DP_TEST_LINK_VIDEO_PATTERN :DRM_DEBUG_KMS ("TEST_PATTERN test requested\n" ); - intel_dp->compliance.test_type =DP_TEST_LINK_VIDEO_PATTERN ; response =intel_dp_autotest_video_pattern (intel_dp);break ;case DP_TEST_LINK_EDID_READ :DRM_DEBUG_KMS ("EDID test requested\n" ); - intel_dp->compliance.test_type =DP_TEST_LINK_EDID_READ ; response =intel_dp_autotest_edid (intel_dp);break ;case DP_TEST_LINK_PHY_TEST_PATTERN :DRM_DEBUG_KMS ("PHY_PATTERN test requested\n" ); - intel_dp->compliance.test_type =DP_TEST_LINK_PHY_TEST_PATTERN ; response =intel_dp_autotest_phy_pattern (intel_dp);break ;default : -DRM_DEBUG_KMS ("Invalid test request '%02x'\n" , rxdata); +DRM_DEBUG_KMS ("Invalid test request '%02x'\n" , request);break ; } +if (response ==DP_TEST_ACK ) + intel_dp->compliance.test_type = request; + update_status: - status =drm_dp_dpcd_write (&intel_dp->aux, -DP_TEST_RESPONSE , - &response,1 ); + status =drm_dp_dpcd_writeb (&intel_dp->aux,DP_TEST_RESPONSE , response);if (status <=0 )DRM_DEBUG_KMS ("Could not write test response to sink\n" ); }
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/dp: do not proceed with autotests if we don't ACK them
== Series Details ==
== Series Details ==
Series: drm/i915/dp: do not proceed with autotests if we don't ACK them
URL : https://patchwork.freedesktop.org/series/18305/
State : success
== Summary ==
Series 18305v1 drm/i915/dp: do not proceed with autotests if we don't ACK them
https://patchwork.freedesktop.org/api/1.0/series/18305/revisions/1/mbox/
fi-bdw-5557u total:246 pass:232 dwarn:0 dfail:0 fail:0 skip:14 fi-bsw-n3050 total:246 pass:207 dwarn:0 dfail:0 fail:0 skip:39 fi-bxt-j4205 total:246 pass:224 dwarn:0 dfail:0 fail:0 skip:22 fi-bxt-t5700 total:79 pass:66 dwarn:0 dfail:0 fail:0 skip:12 fi-byt-j1900 total:246 pass:219 dwarn:0 dfail:0 fail:0 skip:27 fi-byt-n2820 total:246 pass:215 dwarn:0 dfail:0 fail:0 skip:31 fi-hsw-4770 total:246 pass:227 dwarn:0 dfail:0 fail:0 skip:19 fi-hsw-4770r total:246 pass:227 dwarn:0 dfail:0 fail:0 skip:19 fi-ivb-3520m total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21 fi-ivb-3770 total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21 fi-kbl-7500u total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6260u total:246 pass:233 dwarn:0 dfail:0 fail:0 skip:13 fi-skl-6700hq total:246 pass:226 dwarn:0 dfail:0 fail:0 skip:20 fi-skl-6700k total:246 pass:222 dwarn:3 dfail:0 fail:0 skip:21 fi-skl-6770hq total:246 pass:233 dwarn:0 dfail:0 fail:0 skip:13 fi-snb-2520m total:246 pass:215 dwarn:0 dfail:0 fail:0 skip:31 fi-snb-2600 total:246 pass:214 dwarn:0 dfail:0 fail:0 skip:32
aa012aa081f6a6d2dd5a1df0f3c3736017df0d56 drm-tip: 2017y-01m-20d-09h-33m-30s UTC integration manifest e52b416 drm/i915/dp: do not proceed with autotests if we don't ACK them
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3561/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/1 drm/i915/dp: do not proceed with autotests if we don't ACK them
In reply to Jani NikulaThere is no point in setting intel_dp->compliance.test_type, and proceeding with the autotests, if we're about to NAK the request. Some drive-by cleanups while at it.
v2: look at the ACK bit, as the result may also contain
TEST_EDID_CHECKSUM_WRITE
--- drivers/gpu/drm/i915/intel_dp.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +9 -12
@@ -3985,45 +3985,42 @@ static uint8_t intel_dp_autotest_phy_pattern(struct intel_dp *intel_dp)static void intel_dp_handle_test_request (struct intel_dp *intel_dp) {uint8_t response =DP_TEST_NAK ; -uint8_t rxdata =0 ; -int status =0 ; +uint8_t request =0 ; +int status; - status =drm_dp_dpcd_read (&intel_dp->aux,DP_TEST_REQUEST , &rxdata,1 ); + status =drm_dp_dpcd_readb (&intel_dp->aux,DP_TEST_REQUEST , &request);if (status <=0 ) {DRM_DEBUG_KMS ("Could not read test request from sink\n" ); goto update_status; } -switch (rxdata) { +switch (request) {case DP_TEST_LINK_TRAINING :DRM_DEBUG_KMS ("LINK_TRAINING test requested\n" ); - intel_dp->compliance.test_type =DP_TEST_LINK_TRAINING ; response =intel_dp_autotest_link_training (intel_dp);break ;case DP_TEST_LINK_VIDEO_PATTERN :DRM_DEBUG_KMS ("TEST_PATTERN test requested\n" ); - intel_dp->compliance.test_type =DP_TEST_LINK_VIDEO_PATTERN ; response =intel_dp_autotest_video_pattern (intel_dp);break ;case DP_TEST_LINK_EDID_READ :DRM_DEBUG_KMS ("EDID test requested\n" ); - intel_dp->compliance.test_type =DP_TEST_LINK_EDID_READ ; response =intel_dp_autotest_edid (intel_dp);break ;case DP_TEST_LINK_PHY_TEST_PATTERN :DRM_DEBUG_KMS ("PHY_PATTERN test requested\n" ); - intel_dp->compliance.test_type =DP_TEST_LINK_PHY_TEST_PATTERN ; response =intel_dp_autotest_phy_pattern (intel_dp);break ;default : -DRM_DEBUG_KMS ("Invalid test request '%02x'\n" , rxdata); +DRM_DEBUG_KMS ("Invalid test request '%02x'\n" , request);break ; } +if (response &DP_TEST_ACK ) + intel_dp->compliance.test_type = request; + update_status: - status =drm_dp_dpcd_write (&intel_dp->aux, -DP_TEST_RESPONSE , - &response,1 ); + status =drm_dp_dpcd_writeb (&intel_dp->aux,DP_TEST_RESPONSE , response);if (status <=0 )DRM_DEBUG_KMS ("Could not write test response to sink\n" ); }
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Thanks for this patch. I have tested this on DPR 120 compliance test device and verified that it works as expected.
Manasi
Quoted 7 lines · Jani Nikula
There is no point in setting
intel_dp->compliance.test_type, and proceeding with the autotests, if we're about to NAK the request. Some drive-by cleanups while at it.v2: look at the ACK bit, as the result may also contain
TEST_EDID_CHECKSUM_WRITE
Quoted 68 lines
Cc Manasi Navare <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)drivers/gpu/drm/i915/intel_dp.c +9
-12@@ -3985,45 +3985,42 @@ static uint8_t intel_dp_autotest_phy_pattern(struct intel_dp *intel_dp)static void intel_dp_handle_test_request (struct intel_dp *intel_dp) {uint8_t response =DP_TEST_NAK ; -uint8_t rxdata =0 ; -int status =0 ; +uint8_t request =0 ; +int status; - status =drm_dp_dpcd_read (&intel_dp->aux,DP_TEST_REQUEST , &rxdata,1 ); + status =drm_dp_dpcd_readb (&intel_dp->aux,DP_TEST_REQUEST , &request);if (status <=0 ) {DRM_DEBUG_KMS ("Could not read test request from sink\n" ); goto update_status; } -switch (rxdata) { +switch (request) {case DP_TEST_LINK_TRAINING :DRM_DEBUG_KMS ("LINK_TRAINING test requested\n" ); - intel_dp->compliance.test_type =DP_TEST_LINK_TRAINING ; response =intel_dp_autotest_link_training (intel_dp);break ;case DP_TEST_LINK_VIDEO_PATTERN :DRM_DEBUG_KMS ("TEST_PATTERN test requested\n" ); - intel_dp->compliance.test_type =DP_TEST_LINK_VIDEO_PATTERN ; response =intel_dp_autotest_video_pattern (intel_dp);break ;case DP_TEST_LINK_EDID_READ :DRM_DEBUG_KMS ("EDID test requested\n" ); - intel_dp->compliance.test_type =DP_TEST_LINK_EDID_READ ; response =intel_dp_autotest_edid (intel_dp);break ;case DP_TEST_LINK_PHY_TEST_PATTERN :DRM_DEBUG_KMS ("PHY_PATTERN test requested\n" ); - intel_dp->compliance.test_type =DP_TEST_LINK_PHY_TEST_PATTERN ; response =intel_dp_autotest_phy_pattern (intel_dp);break ;default : -DRM_DEBUG_KMS ("Invalid test request '%02x'\n" , rxdata); +DRM_DEBUG_KMS ("Invalid test request '%02x'\n" , request);break ; } +if (response &DP_TEST_ACK ) + intel_dp->compliance.test_type = request; + update_status: - status =drm_dp_dpcd_write (&intel_dp->aux, -DP_TEST_RESPONSE , - &response,1 ); + status =drm_dp_dpcd_writeb (&intel_dp->aux,DP_TEST_RESPONSE , response);if (status <=0 )DRM_DEBUG_KMS ("Could not write test response to sink\n" ); }Signature · 1 line
2.1.4
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Manasi Navare
Thanks for this patch. I have tested this on DPR 120 compliance test device and verified that it works as expected.
Manasi
Quoted 4 lines · Jani Nikula
There is no point in setting
intel_dp->compliance.test_type, and proceeding with the autotests, if we're about to NAK the request. Some drive-by cleanups while at it.
Quoted 6 lines
Quoted 3 lines
v2: look at the ACK bit, as the result may also contain
TEST_EDID_CHECKSUM_WRITEReviewed-by Manasi Navare <[email protected]>Tested-by Manasi Navare <[email protected]>
Thanks for the review and testing, pushed to drm-intel-next-queued.
BR,
Jani.
Quoted 68 lines
Quoted 68 lines
Cc Manasi Navare <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)drivers/gpu/drm/i915/intel_dp.c +9
-12@@ -3985,45 +3985,42 @@ static uint8_t intel_dp_autotest_phy_pattern(struct intel_dp *intel_dp)static void intel_dp_handle_test_request (struct intel_dp *intel_dp) {uint8_t response =DP_TEST_NAK ; -uint8_t rxdata =0 ; -int status =0 ; +uint8_t request =0 ; +int status; - status =drm_dp_dpcd_read (&intel_dp->aux,DP_TEST_REQUEST , &rxdata,1 ); + status =drm_dp_dpcd_readb (&intel_dp->aux,DP_TEST_REQUEST , &request);if (status <=0 ) {DRM_DEBUG_KMS ("Could not read test request from sink\n" ); goto update_status; } -switch (rxdata) { +switch (request) {case DP_TEST_LINK_TRAINING :DRM_DEBUG_KMS ("LINK_TRAINING test requested\n" ); - intel_dp->compliance.test_type =DP_TEST_LINK_TRAINING ; response =intel_dp_autotest_link_training (intel_dp);break ;case DP_TEST_LINK_VIDEO_PATTERN :DRM_DEBUG_KMS ("TEST_PATTERN test requested\n" ); - intel_dp->compliance.test_type =DP_TEST_LINK_VIDEO_PATTERN ; response =intel_dp_autotest_video_pattern (intel_dp);break ;case DP_TEST_LINK_EDID_READ :DRM_DEBUG_KMS ("EDID test requested\n" ); - intel_dp->compliance.test_type =DP_TEST_LINK_EDID_READ ; response =intel_dp_autotest_edid (intel_dp);break ;case DP_TEST_LINK_PHY_TEST_PATTERN :DRM_DEBUG_KMS ("PHY_PATTERN test requested\n" ); - intel_dp->compliance.test_type =DP_TEST_LINK_PHY_TEST_PATTERN ; response =intel_dp_autotest_phy_pattern (intel_dp);break ;default : -DRM_DEBUG_KMS ("Invalid test request '%02x'\n" , rxdata); +DRM_DEBUG_KMS ("Invalid test request '%02x'\n" , request);break ; } +if (response &DP_TEST_ACK ) + intel_dp->compliance.test_type = request; + update_status: - status =drm_dp_dpcd_write (&intel_dp->aux, -DP_TEST_RESPONSE , - &response,1 ); + status =drm_dp_dpcd_writeb (&intel_dp->aux,DP_TEST_RESPONSE , response);if (status <=0 )DRM_DEBUG_KMS ("Could not write test response to sink\n" ); }Signature · 1 line
2.1.4
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/dp: do not proceed with autotests if we don't ACK them (rev2)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/dp: do not proceed with autotests if we don't ACK them (rev2)
URL : https://patchwork.freedesktop.org/series/18305/
State : success
== Summary ==
Series 18305v2 drm/i915/dp: do not proceed with autotests if we don't ACK them
https://patchwork.freedesktop.org/api/1.0/series/18305/revisions/2/mbox/
fi-bdw-5557u total:246 pass:232 dwarn:0 dfail:0 fail:0 skip:14 fi-bsw-n3050 total:246 pass:207 dwarn:0 dfail:0 fail:0 skip:39 fi-bxt-j4205 total:246 pass:224 dwarn:0 dfail:0 fail:0 skip:22 fi-bxt-t5700 total:79 pass:66 dwarn:0 dfail:0 fail:0 skip:12 fi-byt-j1900 total:246 pass:219 dwarn:0 dfail:0 fail:0 skip:27 fi-byt-n2820 total:246 pass:215 dwarn:0 dfail:0 fail:0 skip:31 fi-hsw-4770 total:246 pass:227 dwarn:0 dfail:0 fail:0 skip:19 fi-hsw-4770r total:246 pass:227 dwarn:0 dfail:0 fail:0 skip:19 fi-ivb-3520m total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21 fi-kbl-7500u total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6260u total:246 pass:233 dwarn:0 dfail:0 fail:0 skip:13 fi-skl-6700hq total:246 pass:226 dwarn:0 dfail:0 fail:0 skip:20 fi-skl-6700k total:246 pass:222 dwarn:3 dfail:0 fail:0 skip:21 fi-skl-6770hq total:246 pass:233 dwarn:0 dfail:0 fail:0 skip:13 fi-snb-2520m total:246 pass:215 dwarn:0 dfail:0 fail:0 skip:31 fi-snb-2600 total:246 pass:214 dwarn:0 dfail:0 fail:0 skip:32
aa012aa081f6a6d2dd5a1df0f3c3736017df0d56 drm-tip: 2017y-01m-20d-09h-33m-30s UTC integration manifest 3576a31 drm/i915/dp: do not proceed with autotests if we don't ACK them
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3563/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx