Commit 538f1dcd authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-rockchip-next-2017-02-05' of... 

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
parents 31f408c8 ef1844b7

drivers/gpu/drm/rockchip/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -21,6 +21,16 @@ config ROCKCHIP_ANALOGIX_DP 
	  for the Analogix Core DP driver. If you want to enable DP

	  on RK3288 based SoC, you should selet this option.



config ROCKCHIP_CDN_DP

        tristate "Rockchip cdn DP"

        depends on DRM_ROCKCHIP

	select SND_SOC_HDMI_CODEC if SND_SOC

        help

	  This selects support for Rockchip SoC specific extensions

	  for the cdn DP driver. If you want to enable Dp on

	  RK3399 based SoC, you should select this

	  option.



config ROCKCHIP_DW_HDMI

        tristate "Rockchip specific extensions for Synopsys DW HDMI"

        depends on DRM_ROCKCHIP

drivers/gpu/drm/rockchip/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ rockchipdrm-y := rockchip_drm_drv.o rockchip_drm_fb.o \ 
rockchipdrm-$(CONFIG_DRM_FBDEV_EMULATION) += rockchip_drm_fbdev.o



obj-$(CONFIG_ROCKCHIP_ANALOGIX_DP) += analogix_dp-rockchip.o

obj-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp.o

cdn-dp-objs := cdn-dp-core.o cdn-dp-reg.o

obj-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o

obj-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o

obj-$(CONFIG_ROCKCHIP_INNO_HDMI) += inno_hdmi.o