diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-10-28 03:03:34 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-10-28 03:03:34 +0300 |
| commit | 30aad89ad0697028b9aa0867b3e95cc0ccca064d (patch) | |
| tree | 8f5917318dfd6590edd94be332ca6a9a834e3431 /drivers/pnp/interface.c | |
| parent | f7e87a44ef60ad379e39b45437604141453bf0ec (diff) | |
| parent | 178e561f514fca4863c06a4af3501172e5627eb1 (diff) | |
| download | linux-30aad89ad0697028b9aa0867b3e95cc0ccca064d.tar.xz | |
Merge branch 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-fixes
Three changes for the Armada DRM driver:
1. Add back the flags which tell the DRM core that we can do vblank. This
was removed in error during the recent restructuring, and came to light
while trying textured Xv rendering.
2. Fixing a refcount leak with Xv overlay.
3. As per recent discussion, the drm_vblank_pre_modeset() calls can cause
deadlock with other changes to generic code. This change prevents those
deadlocks by switching to the drm_crtc_vblank_*() calls instead.
* 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
drm/armada: convert to use vblank_on/off calls
drm/armada: fix page_flip refcounting leak
drm/armada: add IRQ support back
Diffstat (limited to 'drivers/pnp/interface.c')
0 files changed, 0 insertions, 0 deletions