Merge branch 'drm-rockchip-2015-07-13' of https://github.com/markyzq/kernel-drm-rockc...
authorDave Airlie <airlied@redhat.com>
Fri, 17 Jul 2015 00:25:02 +0000 (10:25 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 17 Jul 2015 00:25:02 +0000 (10:25 +1000)
commitaaab3bbab8bf847fb390dd7033e7d049fd9c7325
treea86abf51ade0307d3b2dde21e19c692097d97a78
parente1e50e1e1e2d0e515527f0f10b1c495100e582d1
parent0915da7dd75f0f5f38dc9b82415417e7a2b40385
Merge branch 'drm-rockchip-2015-07-13' of https://github.com/markyzq/kernel-drm-rockchip into drm-fixes

misc rockchip fixes.

* 'drm-rockchip-2015-07-13' of https://github.com/markyzq/kernel-drm-rockchip:
  drm/rockchip: vop: remove hardware cursor window
  drm/rockchip: vop: switch cursor plane to window 3
  drm/rockchip: Drop owner assignment from platform_driver
  drm/rockchip: use drm_gem_mmap helpers
  drm/rockchip: only call drm_fb_helper_hotplug_event if fb_helper present
  drm/rockchip: Add BGR formats to VOP
drivers/gpu/drm/rockchip/rockchip_drm_drv.c
drivers/gpu/drm/rockchip/rockchip_drm_vop.c