Merge branch 'drm-rockchip-next-2017-02-05' of https://github.com/markyzq/kernel...
authorDave Airlie <airlied@redhat.com>
Tue, 7 Feb 2017 01:03:30 +0000 (11:03 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 7 Feb 2017 01:03:30 +0000 (11:03 +1000)
commit538f1dcdc5e20adb2488fa0932d56906de166405
treeda6f5198b14870f542e6cee044332e4f799665dd
parent31f408c8a8e7c1976e868206156ae14bf35e4ac9
parentef1844b7ed847430955a95d20242f0d1b9f5fa64
Merge branch 'drm-rockchip-next-2017-02-05' of https://github.com/markyzq/kernel-drm-rockchip into drm-next

rockchip CDN-DP support.

* 'drm-rockchip-next-2017-02-05' of https://github.com/markyzq/kernel-drm-rockchip:
  drm/rockchip: cdn-dp: don't configure hardware in mode_set
  drm/rockchip: cdn-dp: retry to check sink count
  drm/rockchip: cdn-dp: Move mutex_init to probe
  drm/rockchip: cdn-dp: do not use drm_helper_hpd_irq_event
  drm/rockchip: cdn-dp: Do not run worker while suspended
  drm/rockchip: cdn-dp: Load firmware if no monitor connected
  drm/rockchip: cdn-dp: add cdn DP support for rk3399
  drm/rockchip: return ERR_PTR instead of NULL
  drm/rockchip: vop: make vop register setting take effect