diff options
author | Dave Airlie <airlied@redhat.com> | 2009-12-08 05:29:15 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-12-08 05:29:15 +0100 |
commit | 7b0a9e8302522d5f7bb7fab6b8a3c8ce8181609c (patch) | |
tree | c958236a2397b3e5be77d99a494673764341e737 /drivers/gpu/drm/i915/i915_suspend.c | |
parent | Merge remote branch 'korg/drm-radeon-next' into drm-linus (diff) | |
parent | drm/radeon/kms: enable hpd support (diff) | |
download | linux-7b0a9e8302522d5f7bb7fab6b8a3c8ce8181609c.tar.xz linux-7b0a9e8302522d5f7bb7fab6b8a3c8ce8181609c.zip |
Merge remote branch 'korg/drm-radeon-dp' into drm-linus
This merges the radeon KMS DisplayPort and hotplug detect support.
Tested on RV635 DP card with a Dell 2408 monitor.
Conflicts:
drivers/gpu/drm/drm_fb_helper.c
Diffstat (limited to 'drivers/gpu/drm/i915/i915_suspend.c')
0 files changed, 0 insertions, 0 deletions