diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-07 17:55:54 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-07 17:55:54 -0500 |
| commit | af2841cdd4cb35248e41f7427d996c8f6b563051 (patch) | |
| tree | 35ab97f3e63796ec7a1150cb884f6cd5f4faf26e /include | |
| parent | c89b148fd3a8d6c2ea5e7c1c212716baee836af1 (diff) | |
| parent | 36c1813bb453dd078e49bc5b3c1bf7d13535d9ff (diff) | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Misc radeon, nouveau, mgag200 and intel fixes.
The intel fixes should contain the fix for the touchpad on the
Chromebook - hey I'm an input maintainer now!"
Hate to pee on your parade, Dave, but I don't think being an input
maintainer is necessarily something to strive for..
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (25 commits)
drm/tegra: drop "select DRM_HDMI"
drm: Documentation typo fixes
drm/mgag200: Bug fix: Renesas board now selects native resolution.
drm/mgag200: Reject modes that are too big for VRAM
drm/mgag200: 'fbdev_list' in 'struct mga_fbdev' is not used
drm/radeon: don't check mipmap alignment if MIP_ADDRESS is FMASK
drm/radeon: skip MC reset as it's probably not hung
drm/radeon: add primary dac adj quirk for R200 board
drm/radeon: don't set hpd, afmt interrupts when interrupts are disabled
drm/i915: Turn off hsync and vsync on ADPA when disabling crt
drm/i915: Fix incorrect definition of ADPA HSYNC and VSYNC bits
drm/i915: also disable south interrupts when handling them
drm/i915: enable irqs earlier when resuming
drm/i915: Increase the RC6p threshold.
DRM/i915: On G45 enable cursor plane briefly after enabling the display plane.
drm/nv50-: prevent some races between modesetting and page flipping
drm/nouveau/i2c: drop parent refcount when creating ports
drm/nv84: fix regression in page flipping
drm/nouveau: Fix typo in init_idx_addr_latched().
drm/nouveau: Disable AGP on PowerPC again.
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_crtc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 8839b3a24660..e3e0d651c6ca 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h | |||
| @@ -443,12 +443,12 @@ struct drm_crtc { | |||
| 443 | * @dpms: set power state (see drm_crtc_funcs above) | 443 | * @dpms: set power state (see drm_crtc_funcs above) |
| 444 | * @save: save connector state | 444 | * @save: save connector state |
| 445 | * @restore: restore connector state | 445 | * @restore: restore connector state |
| 446 | * @reset: reset connector after state has been invalidate (e.g. resume) | 446 | * @reset: reset connector after state has been invalidated (e.g. resume) |
| 447 | * @detect: is this connector active? | 447 | * @detect: is this connector active? |
| 448 | * @fill_modes: fill mode list for this connector | 448 | * @fill_modes: fill mode list for this connector |
| 449 | * @set_property: property for this connector may need update | 449 | * @set_property: property for this connector may need an update |
| 450 | * @destroy: make object go away | 450 | * @destroy: make object go away |
| 451 | * @force: notify the driver the connector is forced on | 451 | * @force: notify the driver that the connector is forced on |
| 452 | * | 452 | * |
| 453 | * Each CRTC may have one or more connectors attached to it. The functions | 453 | * Each CRTC may have one or more connectors attached to it. The functions |
| 454 | * below allow the core DRM code to control connectors, enumerate available modes, | 454 | * below allow the core DRM code to control connectors, enumerate available modes, |