Looks good to me.
Reviewed-by: Sonika Jindal mailto:intel-gfx-boun...@lists.freedesktop.org] On Behalf Of
Shubhangi Shrivastava
Sent: Wednesday, October 28, 2015 3:31 PM
To: intel-gfx@lists.freedesktop.org
Cc: Shrivastava, Shubhangi
Subject: [Intel-gfx] [PATCH] drm/i915: Cleanup test data during long/short
hotplug
Automated test data that is updated when a test is requested is not cleared
till next automated test request is recevied which can cause various problems.
This patch fixes this by clearing this during the next short pulse and on hot
unplug.
For example, when TEST_LINK_TRAINING is requested it is updated to appropriate
variable inside intel_dp_handle_test_request but is also cleared only inside
the same function. if the next short pulse does not have the
AUTOMATED_TEST_REQUEST bits set the variable will not be cleared resulting in
carrying incorrect test status in local variables.
v2: Added comments and moved nack and defer variables before set_edid
(Sonika)
Signed-off-by: Sivakumar Thulasimani
Signed-off-by: Shubhangi Shrivastava
---
drivers/gpu/drm/i915/intel_dp.c | 30 ++
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 18bcfbe..99b8d8c 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -4317,13 +4317,6 @@ static void intel_dp_handle_test_request(struct intel_dp
*intel_dp)
uint8_t rxdata = 0;
int status = 0;
- intel_dp->compliance_test_active = 0;
- intel_dp->compliance_test_type = 0;
- intel_dp->compliance_test_data = 0;
-
- intel_dp->aux.i2c_nack_count = 0;
- intel_dp->aux.i2c_defer_count = 0;
-
status = drm_dp_dpcd_read(&intel_dp->aux, DP_TEST_REQUEST, &rxdata, 1);
if (status <= 0) {
DRM_DEBUG_KMS("Could not read test request from sink\n"); @@
-4439,6 +4432,14 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)
WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
+ /*
+* Clearing compliance test variables to allow capturing
+* of values for next automated test request.
+*/
+ intel_dp->compliance_test_active = 0;
+ intel_dp->compliance_test_type = 0;
+ intel_dp->compliance_test_data = 0;
+
if (!intel_encoder->base.crtc)
return;
@@ -4817,8 +4818,13 @@ intel_dp_detect(struct drm_connector *connector, bool
force)
status = ironlake_dp_detect(intel_dp);
else
status = g4x_dp_detect(intel_dp);
- if (status != connector_status_connected)
+ if (status != connector_status_connected) {
+ intel_dp->compliance_test_active = 0;
+ intel_dp->compliance_test_type = 0;
+ intel_dp->compliance_test_data = 0;
+
goto out;
+ }
intel_dp_probe_oui(intel_dp);
@@ -4832,6 +4838,14 @@ intel_dp_detect(struct drm_connector *connector, bool
force)
goto out;
}
+ /*
+* Clearing NACK and defer counts to get their exact values
+* while reading EDID which are required by Compliance tests
+* 4.2.2.4 and 4.2.2.5
+*/
+ intel_dp->aux.i2c_nack_count = 0;
+ intel_dp->aux.i2c_defer_count = 0;
+
intel_dp_set_edid(intel_dp);
if (intel_encoder->type != INTEL_OUTPUT_EDP)
--
2.6.1
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
