From: Dave Airlie Date: Wed, 28 Sep 2016 01:22:27 +0000 (+1000) Subject: Merge branch 'for-next' of ssh://people.freedesktop.org/~seanpaul/dogwood into drm... X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=378db830c3cc5c05e2c176274b0d2fcee0b133f3;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'for-next' of ssh://people.freedesktop.org/~seanpaul/dogwood into drm-next I've included some improvements to PSR from myself, as well as a great series from Tomasz to clean up and tighten up vblank/flip handling. The last patch is one from Tomeu that has been floating around for a while, and since rockchip is one of the beneficiaries, I figured this would be a good place to pick it up. * 'for-next' of ssh://people.freedesktop.org/~seanpaul/dogwood: drm/rockchip: Balance irq refcount on failure drm/rockchip: Kill vop_plane_state drm/rockchip: Always signal event in next vblank after cfg_done drm/rockchip: Do not enable vblank without event drm/rockchip: Replace custom wait_for_vblanks with helper drm/rockchip: Unreference framebuffers from flip work drm/rockchip: Avoid race with vblank count increment drm/rockchip: Get rid of some unnecessary code drm/rockchip: Clear interrupt status bits before enabling drm/rockchip: Fix up bug in psr state machine drm/bridge: analogix_dp: Remove duplicated code drm/rockchip: Reduce psr flush time to 100ms drm/rockchip: Don't key off vblank for psr --- 378db830c3cc5c05e2c176274b0d2fcee0b133f3