Merge branch 'drm-rockchip-2015-08-26' of https://github.com/markyzq/kernel-drm-rockc...
authorDave Airlie <airlied@redhat.com>
Fri, 4 Sep 2015 03:08:40 +0000 (13:08 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 4 Sep 2015 03:08:40 +0000 (13:08 +1000)
Here are some fixes and some new features for rockchip drm,
    tested on popmetal rk3288 board, can you land them?

* 'drm-rockchip-2015-08-26' of https://github.com/markyzq/kernel-drm-rockchip:
  drm/rockchip: vop: support plane scale
  drm/rockchip: vop: restore vop registers when resume
  drm/rockchip: vop: Default enable win2/3 area0 bit
  drm/rockchip: vop: Add yuv plane support
  drm/rockchip: vop: Fix window dest start point
  drm/rockchip: vop: Fix virtual stride calculation


Trivial merge