diff options
author | Adam Jackson <ajax@redhat.com> | 2012-09-18 10:58:49 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-10-02 12:06:06 -0400 |
commit | edb39244fad2e96ba03ea97a4b2c585c7f2fc7e4 (patch) | |
tree | aac9701d1d9e28a7bb33a4914257485169392162 /drivers/gpu/drm/i915/intel_drv.h | |
parent | 4e64753a0e697919be1ecc2d5fca1eb5b4358bf3 (diff) |
drm/i915/dp: Fetch downstream port info if needed during DPCD fetch
v2: Fix parenthesis mismatch, spotted by Jani Nikula
Tested-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
[danvet: Fixup merge conflict and MAX_DOWNSTREAM #define as spotted by
Jani.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 351fd7179cd7..79f8ed66574e 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -332,6 +332,7 @@ struct intel_hdmi { | |||
332 | }; | 332 | }; |
333 | 333 | ||
334 | #define DP_RECEIVER_CAP_SIZE 0xf | 334 | #define DP_RECEIVER_CAP_SIZE 0xf |
335 | #define DP_MAX_DOWNSTREAM_PORTS 0x10 | ||
335 | #define DP_LINK_CONFIGURATION_SIZE 9 | 336 | #define DP_LINK_CONFIGURATION_SIZE 9 |
336 | 337 | ||
337 | struct intel_dp { | 338 | struct intel_dp { |
@@ -346,6 +347,7 @@ struct intel_dp { | |||
346 | uint8_t link_bw; | 347 | uint8_t link_bw; |
347 | uint8_t lane_count; | 348 | uint8_t lane_count; |
348 | uint8_t dpcd[DP_RECEIVER_CAP_SIZE]; | 349 | uint8_t dpcd[DP_RECEIVER_CAP_SIZE]; |
350 | uint8_t downstream_ports[DP_MAX_DOWNSTREAM_PORTS]; | ||
349 | struct i2c_adapter adapter; | 351 | struct i2c_adapter adapter; |
350 | struct i2c_algo_dp_aux_data algo; | 352 | struct i2c_algo_dp_aux_data algo; |
351 | bool is_pch_edp; | 353 | bool is_pch_edp; |