aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2011-09-22 01:45:58 -0400
committerKeith Packard <keithp@keithp.com>2011-10-21 02:22:00 -0400
commita2006cf5a7ad3463e7c1e9da2c4bc90499427558 (patch)
tree550705814f2065de699ab048a5df2df202d2e7d9
parentdc22ee6fc18ce0f15424e753e8473c306ece95c1 (diff)
drm/i915: read full receiver capability field during DP hot plug
Read link status first, followed by the full DPCD receiver cap field rather than just the first 8 bytes. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 813939420cb4..e0ff9085fd86 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -36,7 +36,7 @@
36#include "i915_drv.h" 36#include "i915_drv.h"
37#include "drm_dp_helper.h" 37#include "drm_dp_helper.h"
38 38
39 39#define DP_RECEIVER_CAP_SIZE 0xf
40#define DP_LINK_STATUS_SIZE 6 40#define DP_LINK_STATUS_SIZE 6
41#define DP_LINK_CHECK_TIMEOUT (10 * 1000) 41#define DP_LINK_CHECK_TIMEOUT (10 * 1000)
42 42
@@ -53,7 +53,7 @@ struct intel_dp {
53 int dpms_mode; 53 int dpms_mode;
54 uint8_t link_bw; 54 uint8_t link_bw;
55 uint8_t lane_count; 55 uint8_t lane_count;
56 uint8_t dpcd[8]; 56 uint8_t dpcd[DP_RECEIVER_CAP_SIZE];
57 struct i2c_adapter adapter; 57 struct i2c_adapter adapter;
58 struct i2c_algo_dp_aux_data algo; 58 struct i2c_algo_dp_aux_data algo;
59 bool is_pch_edp; 59 bool is_pch_edp;