diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-02-23 14:11:53 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-02-23 14:11:53 +0000 |
| commit | e5bcf23443740f741df8e5461ccdad0f10d1a75b (patch) | |
| tree | 18867fdd805f1beefd3592bca76f4794bdc094b8 /include/media/rc-map.h | |
| parent | 019d96cb55ade38a4b4a52bba0304e8cd681f30a (diff) | |
| parent | ff5f4b0585620e5c158ecaad84d91c5bf3c5d0a1 (diff) | |
Merge tag 'drm-intel-next-2012-02-16-merge-resolved' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next
* tag 'drm-intel-next-2012-02-16-merge-resolved' of git://people.freedesktop.org/~danvet/drm-intel: (45 commits)
Revert "drivers/gpu/drm/i915/intel_overlay.c needs seq_file.h"
drm/i915/lvds: Always use the presence pin for LVDS on PCH
drm/i915: Record the position of the request upon error
drm/i915: Record the in-flight requests at the time of a hang
drm/i915: Record the tail at each request and use it to estimate the head
drm/i915: add missing SDVO bits for interlaced modes on ILK
drm/i915: Fix race condition in accessing GMBUS
drm/i915: add a "force-dvi" HDMI audio mode
drm/i915: Don't lock panel registers when downclocking
drm/i915: fix up locking inconsistency around gem_do_init
drm/i915: enable forcewake voodoo also for gen6
drm/i915: fixup seqno allocation logic for lazy_request
drm/i915: outstanding_lazy_request is a u32
drm/i915: check gtfifodbg after possibly failed writes
drm/i915: catch gtfifo errors on forcewake_put
drm/i915: use gtfifodbg
drm/i915: set interlaced bits for TRANSCONF
drm/i915: fixup overlay checks for interlaced modes
drm/i915: allow interlaced mode output on the HDMI connector
drm/i915: allow interlaced mode output on the SDVO connector
...
Diffstat (limited to 'include/media/rc-map.h')
0 files changed, 0 insertions, 0 deletions