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

Commit b75bf98b authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD
Browse files

Merge tag 'omapdss-for-3.11-2' of git://gitorious.org/linux-omap-dss2/linux into fbdev/for-next 

OMAP display subsystem changes for 3.11 (part 2/2)

This is the second part of OMAP DSS changes for 3.11. This part contains the
new DSS device model support.

The current OMAP panel drivers use a custom DSS bus, and there's a hard limit
of one external display block per video pipeline. In the new DSS device model
the devices/drivers are made according to the control bus of the display block,
usually platform, i2c or spi. The display blocks can also be chained so that we
can have separate drivers for setups with both external encoder and panel.

To allow the current board files, which use the old style panels, to function,
the old display drivers are left in their current state, and new ones are added
to drivers/video/omap2/displays-new/. When the board files have been converted
to use the new style panels, we can remove the old code. This is planned to
happen in v3.12.

Having to support two very different DSS device models makes the driver
somewhat confusing in some parts, and prevents us from properly cleaning up
some other parts. These cleanups will be done when the old code is removed.

The new device model is designed with CDF (Common Display Framework) in mind.
While CDF is still under work, the new DSS device model should be much more
similar to CDF's model than the old device model, which should make the
eventual conversion to CDF much easier.
parents 8e980455 c545b595

drivers/gpu/drm/omapdrm/omap_drv.c

+2 −4
Original line number Diff line number Diff line
@@ -65,10 +65,8 @@ static int get_connector_type(struct omap_dss_device *dssdev) 
	switch (dssdev->type) {

	case OMAP_DISPLAY_TYPE_HDMI:

		return DRM_MODE_CONNECTOR_HDMIA;

	case OMAP_DISPLAY_TYPE_DPI:

		if (!strcmp(dssdev->name, "dvi"))

	case OMAP_DISPLAY_TYPE_DVI:

		return DRM_MODE_CONNECTOR_DVID;

		/* fallthrough */

	default:

		return DRM_MODE_CONNECTOR_Unknown;

	}

drivers/video/omap2/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,5 +6,6 @@ if ARCH_OMAP2PLUS 
source "drivers/video/omap2/dss/Kconfig"

source "drivers/video/omap2/omapfb/Kconfig"

source "drivers/video/omap2/displays/Kconfig"

source "drivers/video/omap2/displays-new/Kconfig"



endif

drivers/video/omap2/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,4 +2,5 @@ obj-$(CONFIG_OMAP2_VRFB) += vrfb.o 


obj-$(CONFIG_OMAP2_DSS) += dss/

obj-y += displays/

obj-y += displays-new/

obj-$(CONFIG_FB_OMAP2) += omapfb/

drivers/video/omap2/displays-new/Kconfig

0 → 100644
+73 −0
Original line number Diff line number Diff line 
menu "OMAP Display Device Drivers (new device model)"

        depends on OMAP2_DSS



config DISPLAY_ENCODER_TFP410

        tristate "TFP410 DPI to DVI Encoder"

	help

	  Driver for TFP410 DPI to DVI encoder.



config DISPLAY_ENCODER_TPD12S015

        tristate "TPD12S015 HDMI ESD protection and level shifter"

	help

	  Driver for TPD12S015, which offers HDMI ESD protection and level

	  shifting.



config DISPLAY_CONNECTOR_DVI

        tristate "DVI Connector"

	depends on I2C

	help

	  Driver for a generic DVI connector.



config DISPLAY_CONNECTOR_HDMI

        tristate "HDMI Connector"

	help

	  Driver for a generic HDMI connector.



config DISPLAY_CONNECTOR_ANALOG_TV

        tristate "Analog TV Connector"

	help

	  Driver for a generic analog TV connector.



config DISPLAY_PANEL_DPI

	tristate "Generic DPI panel"

	help

	  Driver for generic DPI panels.



config DISPLAY_PANEL_DSI_CM

	tristate "Generic DSI Command Mode Panel"

	help

	  Driver for generic DSI command mode panels.



config DISPLAY_PANEL_SONY_ACX565AKM

	tristate "ACX565AKM Panel"

	depends on SPI && BACKLIGHT_CLASS_DEVICE

	help

	  This is the LCD panel used on Nokia N900



config DISPLAY_PANEL_LGPHILIPS_LB035Q02

	tristate "LG.Philips LB035Q02 LCD Panel"

	depends on SPI

	help

	  LCD Panel used on the Gumstix Overo Palo35



config DISPLAY_PANEL_SHARP_LS037V7DW01

        tristate "Sharp LS037V7DW01 LCD Panel"

        depends on BACKLIGHT_CLASS_DEVICE

        help

          LCD Panel used in TI's SDP3430 and EVM boards



config DISPLAY_PANEL_TPO_TD043MTEA1

        tristate "TPO TD043MTEA1 LCD Panel"

        depends on SPI

        help

          LCD Panel used in OMAP3 Pandora



config DISPLAY_PANEL_NEC_NL8048HL11

	tristate "NEC NL8048HL11 Panel"

	depends on SPI

	depends on BACKLIGHT_CLASS_DEVICE

	help

		This NEC NL8048HL11 panel is TFT LCD used in the

		Zoom2/3/3630 sdp boards.



endmenu

drivers/video/omap2/displays-new/Makefile

0 → 100644
+12 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_DISPLAY_ENCODER_TFP410) += encoder-tfp410.o

obj-$(CONFIG_DISPLAY_ENCODER_TPD12S015) += encoder-tpd12s015.o

obj-$(CONFIG_DISPLAY_CONNECTOR_DVI) += connector-dvi.o

obj-$(CONFIG_DISPLAY_CONNECTOR_HDMI) += connector-hdmi.o

obj-$(CONFIG_DISPLAY_CONNECTOR_ANALOG_TV) += connector-analog-tv.o

obj-$(CONFIG_DISPLAY_PANEL_DPI) += panel-dpi.o

obj-$(CONFIG_DISPLAY_PANEL_DSI_CM) += panel-dsi-cm.o

obj-$(CONFIG_DISPLAY_PANEL_SONY_ACX565AKM) += panel-sony-acx565akm.o

obj-$(CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02) += panel-lgphilips-lb035q02.o

obj-$(CONFIG_DISPLAY_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o

obj-$(CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o

obj-$(CONFIG_DISPLAY_PANEL_NEC_NL8048HL11) += panel-nec-nl8048hl11.o