Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a5e6bb9 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'zxdrm-4.11' of... 

Merge tag 'zxdrm-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into drm-next

ZTE DRM driver updates for 4.11:
 - Add missing selection of VIDEOMODE_HELPERS in Kconfig, since ZTE DRM
   driver uses drm_display_mode_to_videomode().
 - Enable HDMI audio support through SPDIF interface based on generic
   hdmi-audio-codec driver.
 - Enable VOU VL (Video Layer) to support overlay plane with scaling
   function.
 - Refine zx_vou driver a bit and then add TV Encoder output device
   support.

[airlied: fixup plane format change]

* tag 'zxdrm-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  drm: zte: add tvenc driver support
  dt: add bindings for ZTE tvenc device
  drm: zte: add function to configure vou_ctrl dividers
  drm: zte: move struct vou_inf into zx_vou driver
  drm: zte: add interlace mode support
  drm: zte: add overlay plane support
  drm: zte: add .atomic_disable hook to disable graphic layer
  drm: zte: make zx_plane accessible from zx_vou driver
  drm: zte: support hdmi audio through spdif
  drm: zte: select VIDEOMODE_HELPERS in Kconfig
parents 26431055 098988cb

Documentation/devicetree/bindings/display/zte,vou.txt

+15 −0
Original line number Diff line number Diff line
@@ -49,6 +49,15 @@ Required properties: 
	"osc_clk"

	"xclk"



* TV Encoder output device



Required properties:

 - compatible: should be "zte,zx296718-tvenc"

 - reg: Physical base address and length of the TVENC device IO region

 - zte,tvenc-power-control: the phandle to SYSCTRL block followed by two

   integer cells.  The first cell is the offset of SYSCTRL register used

   to control TV Encoder DAC power, and the second cell is the bit mask.



Example:



vou: vou@1440000 {
@@ -81,4 +90,10 @@ vou: vou@1440000 { 
			 <&topcrm HDMI_XCLK>;

		clock-names = "osc_cec", "osc_clk", "xclk";

	};



	tvenc: tvenc@2000 {

		compatible = "zte,zx296718-tvenc";

		reg = <0x2000 0x1000>;

		zte,tvenc-power-control = <&sysctrl 0x170 0x10>;

	};

};

drivers/gpu/drm/zte/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -4,5 +4,7 @@ config DRM_ZTE 
	select DRM_KMS_CMA_HELPER

	select DRM_KMS_FB_HELPER

	select DRM_KMS_HELPER

	select SND_SOC_HDMI_CODEC if SND_SOC

	select VIDEOMODE_HELPERS

	help

	  Choose this option to enable DRM on ZTE ZX SoCs.

drivers/gpu/drm/zte/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ zxdrm-y := \ 
	zx_drm_drv.o \

	zx_hdmi.o \

	zx_plane.o \

	zx_tvenc.o \

	zx_vou.o



obj-$(CONFIG_DRM_ZTE) += zxdrm.o

drivers/gpu/drm/zte/zx_drm_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ static struct platform_driver zx_drm_platform_driver = { 
static struct platform_driver *drivers[] = {

	&zx_crtc_driver,

	&zx_hdmi_driver,

	&zx_tvenc_driver,

	&zx_drm_platform_driver,

};

drivers/gpu/drm/zte/zx_drm_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


extern struct platform_driver zx_crtc_driver;

extern struct platform_driver zx_hdmi_driver;

extern struct platform_driver zx_tvenc_driver;



static inline u32 zx_readl(void __iomem *reg)

{