diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-02-13 12:04:45 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-04-29 15:51:13 -0400 |
commit | 33d29b145305641f2c693b759cac468e0c87ab4d (patch) | |
tree | 3527dde3f25ba89eded38a3c7bdaf7443fb1aadc /drivers/gpu/drm/i915/intel_drv.h | |
parent | 52541e30339d932382ab9c0c1d1bacc8dacc541e (diff) |
drm/i915: move intel_crtc->fdi_lanes to pipe_config
We need this for two reasons:
- Correct handling of shared fdi lanes on ivb with fastboot.
- Handling fdi link bw limits when we only have two fdi lanes by
dithering down a bit.
Just search&replace in this patch, no functional change at all.
Reviewed-by: Imre Deak <imre.deak@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 a8c696014967..cc075a312ea3 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -249,6 +249,9 @@ struct intel_crtc_config { | |||
249 | u32 pos; | 249 | u32 pos; |
250 | u32 size; | 250 | u32 size; |
251 | } pch_pfit; | 251 | } pch_pfit; |
252 | |||
253 | /* FDI lanes used, only valid if has_pch_encoder is set. */ | ||
254 | int fdi_lanes; | ||
252 | }; | 255 | }; |
253 | 256 | ||
254 | struct intel_crtc { | 257 | struct intel_crtc { |
@@ -267,7 +270,6 @@ struct intel_crtc { | |||
267 | bool lowfreq_avail; | 270 | bool lowfreq_avail; |
268 | struct intel_overlay *overlay; | 271 | struct intel_overlay *overlay; |
269 | struct intel_unpin_work *unpin_work; | 272 | struct intel_unpin_work *unpin_work; |
270 | int fdi_lanes; | ||
271 | 273 | ||
272 | atomic_t unpin_work_count; | 274 | atomic_t unpin_work_count; |
273 | 275 | ||