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

Commit 8b9f089f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge git://linux-arm.org/linux-ld into drm-next 

Pull upstream HDLCD driver.

* git://linux-arm.org/linux-ld:
  MAINTAINERS: Add Liviu Dudau as maintainer for ARM HDLCD driver.
  drm: Add support for ARM's HDLCD controller.
parents 4102a9e5 c5a906a5

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -827,6 +827,12 @@ S: Maintained 
F:	drivers/net/arcnet/

F:	include/uapi/linux/if_arcnet.h



ARM HDLCD DRM DRIVER

M:	Liviu Dudau <liviu.dudau@arm.com>

S:	Supported

F:	drivers/gpu/drm/arm/

F:	Documentation/devicetree/bindings/display/arm,hdlcd.txt



ARM MFM AND FLOPPY DRIVERS

M:	Ian Molton <spyro@f2s.com>

S:	Maintained

drivers/gpu/drm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -106,6 +106,8 @@ config DRM_TDFX 
	  Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),

	  graphics card.  If M is selected, the module will be called tdfx.



source "drivers/gpu/drm/arm/Kconfig"



config DRM_R128

	tristate "ATI Rage 128"

	depends on DRM && PCI

drivers/gpu/drm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ CFLAGS_drm_trace_points.o := -I$(src) 


obj-$(CONFIG_DRM)	+= drm.o

obj-$(CONFIG_DRM_MIPI_DSI) += drm_mipi_dsi.o

obj-$(CONFIG_DRM_ARM)	+= arm/

obj-$(CONFIG_DRM_TTM)	+= ttm/

obj-$(CONFIG_DRM_TDFX)	+= tdfx/

obj-$(CONFIG_DRM_R128)	+= r128/

drivers/gpu/drm/arm/Kconfig

0 → 100644
+27 −0
Original line number Diff line number Diff line 
config DRM_ARM

	bool

	help

	  Choose this option to select drivers for ARM's devices



config DRM_HDLCD

	tristate "ARM HDLCD"

	depends on DRM && OF && (ARM || ARM64)

	depends on COMMON_CLK

	select DRM_ARM

	select DRM_KMS_HELPER

	select DRM_KMS_FB_HELPER

	select DRM_KMS_CMA_HELPER

	help

	  Choose this option if you have an ARM High Definition Colour LCD

	  controller.



	  If M is selected the module will be called hdlcd.



config DRM_HDLCD_SHOW_UNDERRUN

	bool "Show underrun conditions"

	depends on DRM_HDLCD

	default n

	help

	  Enable this option to show in red colour the pixels that the

	  HDLCD device did not fetch from framebuffer due to underrun

	  conditions.

drivers/gpu/drm/arm/Makefile

0 → 100644
+2 −0
Original line number Diff line number Diff line 
hdlcd-y := hdlcd_drv.o hdlcd_crtc.o

obj-$(CONFIG_DRM_HDLCD)	+= hdlcd.o