diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-04-27 08:21:28 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-04-27 08:21:31 +0100 |
| commit | 792ac99c9a09dae1408617a6578ba189424a911e (patch) | |
| tree | 44b3aa722dcee42c63493e148c51f9cd692805b1 /drivers/dio | |
| parent | b9556e0fa22ae8217289d6be445a2120f7865043 (diff) | |
| parent | 6651819b4b4fc3caa6964c5d825eb4bb996f3905 (diff) | |
| download | linux-792ac99c9a09dae1408617a6578ba189424a911e.tar.bz2 | |
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
From Daniel Vetter
- VGA load-detect fix. This bug seems to be as old as the load-detect code
(2.6.30), but needs stupid userspace (upowerd trying to detect
connectors on dpms-off outputs) to actually kill the machine. And
obviously a machine without VGA-hotplug, otherwise we don't do load
detect.
- 2 interger overflow fixes for unpriviledged ioctls from Xi Wang.
- Fix SDVO regression for low-res (pixelclock < 100MHz) digital outputs,
introduce in 2.6.36.
* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
drm/i915: handle input/output sdvo timings separately in mode_set
drm/i915: fix integer overflow in i915_gem_do_execbuffer()
drm/i915: fix integer overflow in i915_gem_execbuffer2()
drm/i915: fixup load-detect on enabled, but not active pipe
Diffstat (limited to 'drivers/dio')
0 files changed, 0 insertions, 0 deletions