Merge branch 'for-next' of http://git.agner.ch/git/linux-drm-fsl-dcu into drm-next
authorDave Airlie <airlied@redhat.com>
Sat, 2 Jul 2016 06:21:35 +0000 (16:21 +1000)
committerDave Airlie <airlied@redhat.com>
Sat, 2 Jul 2016 06:21:35 +0000 (16:21 +1000)
commitdac2c48ca5ac9bb2d6339aaa733c60d5b801ee86
tree3b288b03448dc0e514de3101e9d9c4498947f084
parent542d972221e024681b502033154f917c1455469f
parentf5bce4309db6597003e683d28d12b1b4bc9408b0
Merge branch 'for-next' of git.agner.ch/git/linux-drm-fsl-dcu into drm-next

The patchset contains a new helper in drm_fb_cma_helper.c for suspend/
resume when using cma backed framebuffers.

* 'for-next' of http://git.agner.ch/git/linux-drm-fsl-dcu:
  drm/fsl-dcu: disable vblank events on CRTC disable
  drm/fsl-dcu: implement suspend/resume using atomic helpers
  drm/fsl-dcu: use clk helpers
  drm/fsl-dcu: move layer initialization to plane file
  drm/fsl-dcu: store layer registers in soc_data
  drm/fb_cma_helper: add suspend helper
drivers/gpu/drm/drm_fb_cma_helper.c
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c