diff options
author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2012-07-17 16:53:45 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-07-25 12:23:48 -0400 |
commit | ab9d7c302af858e1bc8f613c3a6f1eea3c4c0364 (patch) | |
tree | df67556c2ba40c048fcf564afeb8357f4ca2cd27 /drivers/gpu/drm/i915/intel_drv.h | |
parent | 47ea7542a1ac33ba9f15608d2fca00abcc1c11e5 (diff) |
drm/i915: add port field to struct intel_dp and use it
This will be needed for Haswell, but already has its uses here.
This patch started as a small patch written patch by Shobhit Kumar,
but it has changed so much that none of its original lines remain.
Credits-to: Shobhit Kumar <shobhit.kumar@intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
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 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index d234f1af5db5..2846f5e8cca3 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -306,6 +306,7 @@ struct intel_dp { | |||
306 | uint8_t link_configuration[DP_LINK_CONFIGURATION_SIZE]; | 306 | uint8_t link_configuration[DP_LINK_CONFIGURATION_SIZE]; |
307 | bool has_audio; | 307 | bool has_audio; |
308 | enum hdmi_force_audio force_audio; | 308 | enum hdmi_force_audio force_audio; |
309 | enum port port; | ||
309 | uint32_t color_range; | 310 | uint32_t color_range; |
310 | int dpms_mode; | 311 | int dpms_mode; |
311 | uint8_t link_bw; | 312 | uint8_t link_bw; |
@@ -375,7 +376,8 @@ extern void intel_tv_init(struct drm_device *dev); | |||
375 | extern void intel_mark_busy(struct drm_device *dev, | 376 | extern void intel_mark_busy(struct drm_device *dev, |
376 | struct drm_i915_gem_object *obj); | 377 | struct drm_i915_gem_object *obj); |
377 | extern bool intel_lvds_init(struct drm_device *dev); | 378 | extern bool intel_lvds_init(struct drm_device *dev); |
378 | extern void intel_dp_init(struct drm_device *dev, int dp_reg); | 379 | extern void intel_dp_init(struct drm_device *dev, int output_reg, |
380 | enum port port); | ||
379 | void | 381 | void |
380 | intel_dp_set_m_n(struct drm_crtc *crtc, struct drm_display_mode *mode, | 382 | intel_dp_set_m_n(struct drm_crtc *crtc, struct drm_display_mode *mode, |
381 | struct drm_display_mode *adjusted_mode); | 383 | struct drm_display_mode *adjusted_mode); |