commit aed160eac581258f5f280b6e4b3f49b106973a78
author Dave Airlie <airlied@redhat.com> Fri Sep 04 13:08:40 2015 +1000
committer Dave Airlie <airlied@redhat.com> Fri Sep 04 13:08:40 2015 +1000
tree 03c21c3be98fe9c3e20961a6544f3da8b8b9018d
parent 41e8a0a3046530911bf2f2fc28c971bf588858b8
parent 4c156c21c7948a0be854cbe5914af3181303e529

Merge branch 'drm-rockchip-2015-08-26' of https://github.com/markyzq/kernel-drm-rockchip into drm-next

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