Merge branch 'drm-fixes-rockchip-2015-12-02' of https://github.com/markyzq/kernel...
authorDave Airlie <airlied@redhat.com>
Wed, 2 Dec 2015 03:16:24 +0000 (13:16 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 2 Dec 2015 03:16:24 +0000 (13:16 +1000)
commitc936a69981435b994a1ffe1e2a9ccf70aeb09a54
treeb7f8cb08e01c21f730940ab78f67f3f5b0d23d1a
parentd6d38d9d795edc0f31c6c2d4e6743e66564d6c20
parentc9fbb7f7b5c56752373e4f425d5157815426e233
Merge branch 'drm-fixes-rockchip-2015-12-02' of https://github.com/markyzq/kernel-drm-rockchip into drm-fixes

Rockchip fixes from Mark.

* 'drm-fixes-rockchip-2015-12-02' of https://github.com/markyzq/kernel-drm-rockchip:
  drm/rockchip: Use CRTC vblank event interface
  drm/rockchip: Fix module autoload for OF platform driver
  drm/rockchip: vop: fix window origin calculation
  drm/rockchip: unset pgoff when mmap'ing gems
  drm/rockchip: vop: Correct enabled clocks during setup