]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/i915/dp: read more receiver capability bits on hotplug
authorJesse Barnes <jbarnes@virtuousgeek.org>
Thu, 7 Jul 2011 18:10:59 +0000 (11:10 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 7 Jul 2011 20:38:40 +0000 (13:38 -0700)
When a hotplug event is received, we need to check the receiver cap bits
in case they've changed (as they might with a hub or chain config).

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
drivers/gpu/drm/i915/intel_dp.c

index fc51730b89d6d333633c3eaeeeb63d4cf7889185..a9a5051419dff9cc433f5907fe6ac530d3271fc4 100644 (file)
@@ -1522,6 +1522,8 @@ intel_dp_link_down(struct intel_dp *intel_dp)
 static void
 intel_dp_check_link_status(struct intel_dp *intel_dp)
 {
+       int ret;
+
        if (!intel_dp->base.base.crtc)
                return;
 
@@ -1530,6 +1532,15 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)
                return;
        }
 
+       /* Try to read receiver status if the link appears to be up */
+       ret = intel_dp_aux_native_read(intel_dp,
+                                      0x000, intel_dp->dpcd,
+                                      sizeof (intel_dp->dpcd));
+       if (ret != sizeof(intel_dp->dpcd)) {
+               intel_dp_link_down(intel_dp);
+               return;
+       }
+
        if (!intel_channel_eq_ok(intel_dp)) {
                intel_dp_start_link_train(intel_dp);
                intel_dp_complete_link_train(intel_dp);