]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'topic/atomic-core-2015-01-27' of git://anongit.freedesktop.org/drm-intel...
authorDave Airlie <airlied@redhat.com>
Tue, 27 Jan 2015 23:34:27 +0000 (09:34 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 27 Jan 2015 23:34:27 +0000 (09:34 +1000)
commit7c36ca4cda57b49c94a46bdb6e2219d720fdee73
tree362e701c962f8a78978775ff3e4093b490ee0cd1
parent81f698976bff7b8081cbe3eacac7ef0faab28f91
parentdefb6c0649231919dcd95a7b4ceb250ea5717717
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
drivers/gpu/drm/drm_atomic.c
drivers/gpu/drm/drm_atomic_helper.c
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/drm_plane_helper.c
include/drm/drm_atomic_helper.h
include/drm/drm_crtc.h
include/drm/drm_crtc_helper.h