From: Dave Airlie <airlied@redhat.com>
Date: Thu, 19 Mar 2015 04:05:53 +0000 (+1000)
Subject: Merge branch 'drm_next' of https://github.com/markyzq/kernel-drm-rockchip into drm... 
X-Git-Tag: v4.1-rc1~69^2~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b94aea01d4f96235e947892f6c39f837045e741;p=thirdparty%2Fkernel%2Flinux.git

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

rockchip fixes.

* 'drm_next' of https://github.com/markyzq/kernel-drm-rockchip:
  drm/rockchip: vop: power off until vop standby take effect
  drm/rockchip: vop: set vop enabled after enable iommu
  drm/rockchip: vop use is_enabled instead of dpms mode
  drm/rockchip: vop: fix vop vsync/hsync polarity
  drm/rockchip: Only alloc a kmap for fbdev gem object
---

6b94aea01d4f96235e947892f6c39f837045e741