diff options
author | Dave Airlie <airlied@redhat.com> | 2015-01-28 00:34:27 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-01-28 00:34:27 +0100 |
commit | 21773f16f2cb3c056051c679da542f0b494252e2 (patch) | |
tree | 362e701c962f8a78978775ff3e4093b490ee0cd1 /include/drm/drmP.h | |
parent | Merge tag 'drm/tegra/for-3.20-rc1' of git://anongit.freedesktop.org/tegra/lin... (diff) | |
parent | drm/atomic: Fix potential use of state after free (diff) | |
download | linux-21773f16f2cb3c056051c679da542f0b494252e2.tar.xz linux-21773f16f2cb3c056051c679da542f0b494252e2.zip |
Merge tag 'topic/atomic-core-2015-01-27' of git://anongit.freedesktop.org/drm-intel into drm-next
* tag 'topic/atomic-core-2015-01-27' of git://anongit.freedesktop.org/drm-intel:
drm/atomic: Fix potential use of state after free
drm/atomic-helper: debug output for modesets
drm/atomic-helpers: Saner encoder/crtc callbacks
drm/atomic-helpers: Recover full cursor plane behaviour
drm/atomic-helper: add connector->dpms() implementation
drm/atomic: Add drm_crtc_state->active
drm: Add standardized boolean props
drm/plane-helper: Fix transitional helper kerneldocs
drm/plane-helper: Skip prepare_fb/cleanup_fb when newfb==oldfb
Conflicts:
include/drm/drm_crtc_helper.h
Diffstat (limited to 'include/drm/drmP.h')
0 files changed, 0 insertions, 0 deletions