Rev 6937 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 6937 | Rev 7144 | ||
|---|---|---|---|
| Line 29... | Line 29... | ||
| 29 | 29 | ||
| 30 | //#include |
30 | //#include |
| 31 | #include |
31 | #include |
| 32 | #include |
32 | #include |
| - | 33 | #include |
|
| 33 | #include |
34 | #include |
| 34 | #include |
35 | #include |
| 35 | #include |
36 | #include |
| 36 | #include |
37 | #include |
| 37 | #include |
38 | #include |
| Line 120... | Line 121... | ||
| 120 | else |
121 | else |
| 121 | flags |= DRM_MODE_FLAG_PVSYNC; |
122 | flags |= DRM_MODE_FLAG_PVSYNC; |
| Line 122... | Line 123... | ||
| 122 | 123 | ||
| Line -... | Line 124... | ||
| - | 124 | pipe_config->base.adjusted_mode.flags |= flags; |
|
| - | 125 | ||
| - | 126 | if (INTEL_INFO(dev)->gen < 5) |
|
| - | 127 | pipe_config->gmch_pfit.lvds_border_bits = |
|
| 123 | pipe_config->base.adjusted_mode.flags |= flags; |
128 | tmp & LVDS_BORDER_ENABLE; |
| 124 | 129 | ||
| 125 | /* gen2/3 store dither state in pfit control, needs to match */ |
130 | /* gen2/3 store dither state in pfit control, needs to match */ |
| Line 126... | Line 131... | ||
| 126 | if (INTEL_INFO(dev)->gen < 4) { |
131 | if (INTEL_INFO(dev)->gen < 4) { |
| Line 476... | Line 481... | ||
| 476 | * platforms is rather conservative and a bit arbitrary expect that on |
481 | * platforms is rather conservative and a bit arbitrary expect that on |
| 477 | * those platforms VGA disabling requires actual legacy VGA I/O access, |
482 | * those platforms VGA disabling requires actual legacy VGA I/O access, |
| 478 | * and as part of the cleanup in the hw state restore we also redisable |
483 | * and as part of the cleanup in the hw state restore we also redisable |
| 479 | * the vga plane. |
484 | * the vga plane. |
| 480 | */ |
485 | */ |
| 481 | if (!HAS_PCH_SPLIT(dev)) { |
486 | if (!HAS_PCH_SPLIT(dev)) |
| 482 | drm_modeset_lock_all(dev); |
- | |
| 483 | intel_display_resume(dev); |
487 | intel_display_resume(dev); |
| 484 | drm_modeset_unlock_all(dev); |
- | |
| 485 | } |
- | |
| Line 486... | Line 488... | ||
| 486 | 488 | ||
| Line 487... | Line 489... | ||
| 487 | dev_priv->modeset_restore = MODESET_DONE; |
489 | dev_priv->modeset_restore = MODESET_DONE; |
| 488 | 490 | ||