diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-02-02 11:22:34 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-02-02 11:22:34 +1000 |
| commit | a55205e229e4e16559cc2593fdfc37902b248879 (patch) | |
| tree | 09286776b4c88e7721a4a313fe3064c1a79f9fd4 /drivers/gpu/drm/nouveau/nouveau_pm.c | |
| parent | e468e0017b656841b661e57a948c3b858d58b959 (diff) | |
| parent | 5fe49d86f9d01044abf687a8cd21edef636d58aa (diff) | |
Merge remote branch 'intel/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes
* 'intel/drm-intel-fixes' of /ssd/git/drm-next:
drm/i915: Only bind to function 0 of the PCI device
drm/i915: Suppress spurious vblank interrupts
drm: Avoid leak of adjusted mode along quick set_mode paths
drm: Simplify and defend later checks when disabling a crtc
drm: Don't switch fb when disabling an output
drm/i915: Reset crtc after resume
drm/i915/crt: Force the initial probe after reset
drm/i915: Reset state after a GPU reset or resume
drm: Add an interface to reset the device
drm/i915/sdvo: If at first we don't succeed in reading the response, wait
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_pm.c')
0 files changed, 0 insertions, 0 deletions