The DISPLAY_ prefix will clash with the Common Display Framework, rename it.

Signed-off-by: Laurent Pinchart laurent.pinchart+renesas@ideasonboard.com --- drivers/video/omap2/displays-new/Kconfig | 24 ++++++++++++------------ drivers/video/omap2/displays-new/Makefile | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/drivers/video/omap2/displays-new/Kconfig b/drivers/video/omap2/displays-new/Kconfig index 6c90885..2a44b41 100644 --- a/drivers/video/omap2/displays-new/Kconfig +++ b/drivers/video/omap2/displays-new/Kconfig @@ -1,68 +1,68 @@ menu "OMAP Display Device Drivers (new device model)" depends on OMAP2_DSS

-config DISPLAY_ENCODER_TFP410 +config OMAP2_DISPLAY_ENCODER_TFP410 tristate "TFP410 DPI to DVI Encoder" help Driver for TFP410 DPI to DVI encoder.

-config DISPLAY_ENCODER_TPD12S015 +config OMAP2_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 +config OMAP2_DISPLAY_CONNECTOR_DVI tristate "DVI Connector" depends on I2C help Driver for a generic DVI connector.

-config DISPLAY_CONNECTOR_HDMI +config OMAP2_DISPLAY_CONNECTOR_HDMI tristate "HDMI Connector" help Driver for a generic HDMI connector.

-config DISPLAY_CONNECTOR_ANALOG_TV +config OMAP2_DISPLAY_CONNECTOR_ANALOG_TV tristate "Analog TV Connector" help Driver for a generic analog TV connector.

-config DISPLAY_PANEL_DPI +config OMAP2_DISPLAY_PANEL_DPI tristate "Generic DPI panel" help Driver for generic DPI panels.

-config DISPLAY_PANEL_DSI_CM +config OMAP2_DISPLAY_PANEL_DSI_CM tristate "Generic DSI Command Mode Panel" help Driver for generic DSI command mode panels.

-config DISPLAY_PANEL_SONY_ACX565AKM +config OMAP2_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 +config OMAP2_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 +config OMAP2_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 +config OMAP2_DISPLAY_PANEL_TPO_TD043MTEA1 tristate "TPO TD043MTEA1 LCD Panel" depends on SPI help LCD Panel used in OMAP3 Pandora

-config DISPLAY_PANEL_NEC_NL8048HL11 +config OMAP2_DISPLAY_PANEL_NEC_NL8048HL11 tristate "NEC NL8048HL11 Panel" depends on SPI depends on BACKLIGHT_CLASS_DEVICE diff --git a/drivers/video/omap2/displays-new/Makefile b/drivers/video/omap2/displays-new/Makefile index 5aeb11b..768ad94 100644 --- a/drivers/video/omap2/displays-new/Makefile +++ b/drivers/video/omap2/displays-new/Makefile @@ -1,12 +1,12 @@ -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 +obj-$(CONFIG_OMAP2_DISPLAY_ENCODER_TFP410) += encoder-tfp410.o +obj-$(CONFIG_OMAP2_DISPLAY_ENCODER_TPD12S015) += encoder-tpd12s015.o +obj-$(CONFIG_OMAP2_DISPLAY_CONNECTOR_DVI) += connector-dvi.o +obj-$(CONFIG_OMAP2_DISPLAY_CONNECTOR_HDMI) += connector-hdmi.o +obj-$(CONFIG_OMAP2_DISPLAY_CONNECTOR_ANALOG_TV) += connector-analog-tv.o +obj-$(CONFIG_OMAP2_DISPLAY_PANEL_DPI) += panel-dpi.o +obj-$(CONFIG_OMAP2_DISPLAY_PANEL_DSI_CM) += panel-dsi-cm.o +obj-$(CONFIG_OMAP2_DISPLAY_PANEL_SONY_ACX565AKM) += panel-sony-acx565akm.o +obj-$(CONFIG_OMAP2_DISPLAY_PANEL_LGPHILIPS_LB035Q02) += panel-lgphilips-lb035q02.o +obj-$(CONFIG_OMAP2_DISPLAY_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o +obj-$(CONFIG_OMAP2_DISPLAY_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o +obj-$(CONFIG_OMAP2_DISPLAY_PANEL_NEC_NL8048HL11) += panel-nec-nl8048hl11.o

The video and stream control operations handle video stream management, both from the control point of view (called in response to userspace requests) and the video stream point of view (called by entities to control the video stream they receive on their input(s)).

Signed-off-by: Laurent Pinchart laurent.pinchart+renesas@ideasonboard.com --- drivers/video/display/display-core.c | 82 ++++++++++++++++++++++++++++++++++++ include/video/display.h | 49 +++++++++++++++++++++ 2 files changed, 131 insertions(+)

diff --git a/drivers/video/display/display-core.c b/drivers/video/display/display-core.c index 82fc58b..bb18723 100644 --- a/drivers/video/display/display-core.c +++ b/drivers/video/display/display-core.c @@ -25,6 +25,57 @@ */

/** + * display_entity_set_state - Set the display entity operation state + * @entity: The display entity + * @state: Display entity operation state + * + * See &enum display_entity_state for information regarding the entity states. + * + * Return 0 on success or a negative error code otherwise. + */ +int display_entity_set_state(struct display_entity *entity, + enum display_entity_state state) +{ + int ret; + + if (entity->state == state) + return 0; + + if (!entity->ops->ctrl || !entity->ops->ctrl->set_state) + return 0; + + ret = entity->ops->ctrl->set_state(entity, state); + if (ret < 0) + return ret; + + entity->state = state; + return 0; +} +EXPORT_SYMBOL_GPL(display_entity_set_state); + +/** + * display_entity_update - Update the display + * @entity: The display entity + * + * Make the display entity ready to receive pixel data and start frame transfer. + * This operation can only be called if the display entity is in STANDBY or ON + * state. + * + * The display entity will call the upstream entity in the video chain to start + * the video stream. + * + * Return 0 on success or a negative error code otherwise. + */ +int display_entity_update(struct display_entity *entity) +{ + if (!entity->ops->ctrl || !entity->ops->ctrl->update) + return 0; + + return entity->ops->ctrl->update(entity); +} +EXPORT_SYMBOL_GPL(display_entity_update); + +/** * display_entity_get_modes - Get video modes supported by the display entity * @entity: The display entity * @port: The display entity port @@ -95,6 +146,36 @@ int display_entity_get_params(struct display_entity *entity, unsigned int port, EXPORT_SYMBOL_GPL(display_entity_get_params);

/* ----------------------------------------------------------------------------- + * Video operations + */ + +/** + * display_entity_set_stream - Control the video stream state + * @entity: The display entity + * @port: The display entity port + * @state: Display video stream state + * + * Control the video stream state at the entity video output. + * + * See &enum display_entity_stream_state for information regarding the stream + * states. + * + * Return 0 on success or a negative error code otherwise. + */ +int display_entity_set_stream(struct display_entity *entity, unsigned int port, + enum display_entity_stream_state state) +{ + if (port >= entity->entity.num_pads) + return -EINVAL; + + if (!entity->ops->video || !entity->ops->video->set_stream) + return 0; + + return entity->ops->video->set_stream(entity, port, state); +} +EXPORT_SYMBOL_GPL(display_entity_set_stream); + +/* ----------------------------------------------------------------------------- * Connections */

@@ -177,6 +258,7 @@ int display_entity_init(struct display_entity *entity, unsigned int num_sinks, int ret;

kref_init(&entity->ref); + entity->state = DISPLAY_ENTITY_STATE_OFF;

num_pads = num_sinks + num_sources; pads = kzalloc(sizeof(*pads) * num_pads, GFP_KERNEL); diff --git a/include/video/display.h b/include/video/display.h index 74b227d..fef05a68 100644 --- a/include/video/display.h +++ b/include/video/display.h @@ -25,6 +25,38 @@ struct display_entity; struct videomode;

+/** + * enum display_entity_state - State of a display entity + * @DISPLAY_ENTITY_STATE_OFF: The entity is turned off completely, possibly + * including its power supplies. Communication with a display entity in + * that state is not possible. + * @DISPLAY_ENTITY_STATE_STANDBY: The entity is in a low-power state. Full + * communication with the display entity is supported, including pixel data + * transfer, but the output is kept blanked. + * @DISPLAY_ENTITY_STATE_ON: The entity is fully operational. + */ +enum display_entity_state { + DISPLAY_ENTITY_STATE_OFF, + DISPLAY_ENTITY_STATE_STANDBY, + DISPLAY_ENTITY_STATE_ON, +}; + +/** + * enum display_entity_stream_state - State of a video stream + * @DISPLAY_ENTITY_STREAM_STOPPED: The video stream is stopped, no frames are + * transferred. + * @DISPLAY_ENTITY_STREAM_SINGLE_SHOT: The video stream has been started for + * single shot operation. The source entity will transfer a single frame + * and then stop. + * @DISPLAY_ENTITY_STREAM_CONTINUOUS: The video stream is running, frames are + * transferred continuously by the source entity. + */ +enum display_entity_stream_state { + DISPLAY_ENTITY_STREAM_STOPPED, + DISPLAY_ENTITY_STREAM_SINGLE_SHOT, + DISPLAY_ENTITY_STREAM_CONTINUOUS, +}; + enum display_entity_interface_type { DISPLAY_ENTITY_INTERFACE_DPI, DISPLAY_ENTITY_INTERFACE_DBI, @@ -39,6 +71,9 @@ struct display_entity_interface_params { struct display_entity_control_ops { int (*get_size)(struct display_entity *ent, unsigned int *width, unsigned int *height); + int (*set_state)(struct display_entity *ent, + enum display_entity_state state); + int (*update)(struct display_entity *ent);

/* Port operations */ int (*get_modes)(struct display_entity *entity, unsigned int port, @@ -47,8 +82,14 @@ struct display_entity_control_ops { struct display_entity_interface_params *params); };

+struct display_entity_video_ops { + int (*set_stream)(struct display_entity *ent, unsigned int port, + enum display_entity_stream_state state); +}; + struct display_entity_ops { const struct display_entity_control_ops *ctrl; + const struct display_entity_video_ops *video; };

struct display_entity { @@ -63,6 +104,8 @@ struct display_entity { const struct display_entity_ops *ops;

void(*release)(struct display_entity *ent); + + enum display_entity_state state; };

static inline struct display_entity * @@ -86,9 +129,15 @@ void display_entity_put(struct display_entity *entity);

int display_entity_get_size(struct display_entity *entity, unsigned int *width, unsigned int *height); +int display_entity_set_state(struct display_entity *entity, + enum display_entity_state state); +int display_entity_update(struct display_entity *entity); int display_entity_get_modes(struct display_entity *entity, unsigned int port, const struct videomode **modes); int display_entity_get_params(struct display_entity *entity, unsigned int port, struct display_entity_interface_params *params);

+int display_entity_set_stream(struct display_entity *entity, unsigned int port, + enum display_entity_stream_state state); + #endif /* __DISPLAY_H__ */

Add two graph helper functions. display_entity_build_notifier() builds an entity notifier from an entities graph represented as a flat array, typically passed from platform data. display_entity_link_graph() can then be used to create media controller links between all entities in the graph.

Signed-off-by: Laurent Pinchart laurent.pinchart+renesas@ideasonboard.com --- drivers/video/display/display-core.c | 107 +++++++++++++++++++++++++++++++ drivers/video/display/display-notifier.c | 51 +++++++++++++++ include/video/display.h | 20 ++++++ 3 files changed, 178 insertions(+)

diff --git a/drivers/video/display/display-core.c b/drivers/video/display/display-core.c index bb18723..c3b47d3 100644 --- a/drivers/video/display/display-core.c +++ b/drivers/video/display/display-core.c @@ -10,6 +10,7 @@ * published by the Free Software Foundation. */

+#include <linux/device.h> #include <linux/export.h> #include <linux/kernel.h> #include <linux/module.h> @@ -313,6 +314,112 @@ void display_entity_unregister(struct display_entity *entity) } EXPORT_SYMBOL_GPL(display_entity_unregister);

+/* ----------------------------------------------------------------------------- + * Graph Helpers + */ + +static int display_entity_link_entity(struct device *dev, + struct display_entity *entity, + struct list_head *entities) +{ + const struct display_entity_graph_data *graph = entity->match->data; + u32 link_flags = MEDIA_LNK_FL_IMMUTABLE | MEDIA_LNK_FL_ENABLED; + struct media_entity *local = &entity->entity; + unsigned int i; + int ret = 0; + + dev_dbg(dev, "creating links for entity %s\n", local->name); + + for (i = 0; i < entity->entity.num_pads; ++i) { + const struct display_entity_source_data *source; + struct media_pad *local_pad = &local->pads[i]; + struct media_entity *remote = NULL; + struct media_pad *remote_pad; + struct display_entity *ent; + + dev_dbg(dev, "processing pad %u\n", i); + + /* Skip source pads, they will be processed from the other end + * of the link. + */ + if (local_pad->flags & MEDIA_PAD_FL_SOURCE) { + dev_dbg(dev, "skipping source pad %s:%u\n", + local->name, i); + continue; + } + + /* Find the remote entity. If not found, just skip the link as + * it goes out of scope of the entities handled by the notifier. + */ + source = &graph->sources[i]; + list_for_each_entry(ent, entities, list) { + if (strcmp(source->name, dev_name(ent->dev)) == 0) { + remote = &ent->entity; + break; + } + } + + if (remote == NULL) { + dev_dbg(dev, "no entity found for %s\n", source->name); + continue; + } + + if (source->port >= remote->num_pads) { + dev_err(dev, "invalid port number %u on %s\n", + source->port, source->name); + ret = -EINVAL; + break; + } + + remote_pad = &remote->pads[source->port]; + + /* Create the media link. */ + dev_dbg(dev, "creating %s:%u -> %s:%u link\n", + remote->name, remote_pad->index, + local->name, local_pad->index); + + ret = media_entity_create_link(remote, remote_pad->index, + local, local_pad->index, + link_flags); + if (ret < 0) { + dev_err(dev, "failed to create %s:%u -> %s:%u link\n", + remote->name, remote_pad->index, + local->name, local_pad->index); + break; + } + } + + return ret; +} + +/** + * display_entity_link_graph - Link all entities in a graph + * @dev: device used to print debugging and error messages + * @entities: list of display entities in the graph + * + * This function creates media controller links for all entities in a graph + * based on graph link data. It relies on the entities match data pointers + * having been initialized by the display_entity_build_notifier() function when + * building the notifier and thus can't be used when the notifier is built in a + * different way. + * + * Return 0 on success or a negative error code otherwise. + */ +int display_entity_link_graph(struct device *dev, struct list_head *entities) +{ + struct display_entity *entity; + int ret; + + list_for_each_entry(entity, entities, list) { + ret = display_entity_link_entity(dev, entity, entities); + if (ret < 0) + return ret; + } + + return 0; +} +EXPORT_SYMBOL_GPL(display_entity_link_graph); + MODULE_AUTHOR("Laurent Pinchart laurent.pinchart@ideasonboard.com"); MODULE_DESCRIPTION("Display Core"); MODULE_LICENSE("GPL"); diff --git a/drivers/video/display/display-notifier.c b/drivers/video/display/display-notifier.c index c9210ec..2d752b3 100644 --- a/drivers/video/display/display-notifier.c +++ b/drivers/video/display/display-notifier.c @@ -220,6 +220,57 @@ void display_entity_unregister_notifier(struct display_entity_notifier *notifier } EXPORT_SYMBOL_GPL(display_entity_unregister_notifier);

+/** + * display_entity_build_notifier - build a notifier from graph data + * @notifier: display entity notifier to be built + * @graph: graph data + * + * Before registering a notifier drivers must initialize the notifier's list of + * entities. This helper function simplifies building the list of entities for + * drivers that use an array of struct display_entity_graph_data to describe the + * entities graph. + * + * The function allocates an array of struct display_entity_match, initialize it + * from graph data, and sets the notifier entities and num_entities fields. + * + * The entities array is allocated using the managed memory allocation API on + * the notifier device, which must be initialized before calling this function. + * + * Return 0 on success or a negative error code on error. + */ +int display_entity_build_notifier(struct display_entity_notifier *notifier, + const struct display_entity_graph_data *graph) +{ + struct display_entity_match *entities; + unsigned int num_entities; + unsigned int i; + + for (num_entities = 0; graph[num_entities].name; ++num_entities) { + } + + if (num_entities == 0) + return -EINVAL; + + entities = devm_kzalloc(notifier->dev, sizeof(*notifier->entities) * + num_entities, GFP_KERNEL); + if (entities == NULL) + return -ENOMEM; + + for (i = 0; i < num_entities; ++i) { + struct display_entity_match *match = &entities[i]; + + match->type = DISPLAY_ENTITY_BUS_PLATFORM; + match->match.platform.name = graph[i].name; + match->data = &graph[i]; + } + + notifier->num_entities = num_entities; + notifier->entities = entities; + + return 0; +} +EXPORT_SYMBOL_GPL(display_entity_build_notifier); + /* ----------------------------------------------------------------------------- * Entity Registration */ diff --git a/include/video/display.h b/include/video/display.h index 2063694..58ff0d1 100644 --- a/include/video/display.h +++ b/include/video/display.h @@ -159,6 +159,7 @@ enum display_entity_bus_type { * @match.platform.name: platform device name * @match.dt.node: DT node * @list: link match objects waiting to be matched + * @data: driver private data, not touched by the core */ struct display_entity_match { enum display_entity_bus_type type; @@ -169,6 +170,7 @@ struct display_entity_match { } match;

struct list_head list; + const void *data; };

/** @@ -206,4 +208,22 @@ void display_entity_unregister_notifier(struct display_entity_notifier *notifier int display_entity_add(struct display_entity *entity); void display_entity_remove(struct display_entity *entity);

+/* ----------------------------------------------------------------------------- + * Graph Helpers + */ + +struct display_entity_source_data { + const char *name; + unsigned int port; +}; + +struct display_entity_graph_data { + const char *name; + const struct display_entity_source_data *sources; +}; + +int display_entity_build_notifier(struct display_entity_notifier *notifier, + const struct display_entity_graph_data *graph); +int display_entity_link_graph(struct device *dev, struct list_head *entities); + #endif /* __DISPLAY_H__ */

Pixel codings describe how pixels are transmitted on a physical bus. The information can be communicated between drivers to configure devices.

Signed-off-by: Laurent Pinchart laurent.pinchart@ideasonboard.com --- include/video/display.h | 120 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+)

diff --git a/include/video/display.h b/include/video/display.h index 36ff637..ba319d6 100644 --- a/include/video/display.h +++ b/include/video/display.h @@ -18,6 +18,126 @@ #include <linux/module.h> #include <media/media-entity.h>

+#define DISPLAY_PIXEL_CODING(option, type, from, to, variant) \ + (((option) << 17) | ((type) << 13) | ((variant) << 10) | \ + ((to) << 5) | (from)) + +#define DISPLAY_PIXEL_CODING_FROM(coding) ((coding) & 0x1f) +#define DISPLAY_PIXEL_CODING_TO(coding) (((coding) >> 5) & 0x1f) +#define DISPLAY_PIXEL_CODING_VARIANT(coding) (((coding) >> 10) & 7) +#define DISPLAY_PIXEL_CODING_TYPE(coding) (((coding) >> 13) & 0xf) + +#define DISPLAY_PIXEL_CODING_TYPE_DBI 0 +#define DISPLAY_PIXEL_CODING_TYPE_DPI 1 + +/* DBI pixel codings. */ +#define DISPLAY_PIXEL_CODING_DBI(from, to, variant) \ + DISPLAY_PIXEL_CODING_TYPE(DISPLAY_PIXEL_CODING_TYPE_DBI, \ + from, to, variant, 0) + +/* Standard DBI codings, defined in the DBI specification. */ +/* 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0 */ +/* - - - - - - - - - - R0,2 R0,1 R0,0 G0,2 G0,1 G0,0 B0,1 B0,0 */ +#define DISPLAY_PIXEL_CODING_DBI_8TO8 DISPLAY_PIXEL_CODING_DBI(8, 8, 0) +/* - - - - - - - - - - R0,3 R0,2 R0,1 R0,0 G0,3 G0,2 G0,1 G0,0 */ +/* - - - - - - - - - - B0,3 B0,2 B0,1 B0,0 R1,3 R1,2 R1,1 R1,0 */ +/* - - - - - - - - - - G1,3 G1,2 G1,1 G1,0 B1,3 B1,2 B1,1 b1,0 */ +#define DISPLAY_PIXEL_CODING_DBI_12TO8 DISPLAY_PIXEL_CODING_DBI(12, 8, 0) +/* - - - - - - - - - - R0,4 R0,3 R0,2 R0,1 R0,0 G0,5 G0,4 G0,3 */ +/* - - - - - - - - - - G0,2 G0,1 G0,0 B0,4 B0,3 B0,2 B0,1 B0,0 */ +#define DISPLAY_PIXEL_CODING_DBI_16TO8 DISPLAY_PIXEL_CODING_DBI(16, 8, 0) +/* - - - - - - - - - - R0,5 R0,4 R0,3 R0,2 R0,1 R0,0 - - */ +/* - - - - - - - - - - G0,5 G0,4 G0,3 G0,2 G0,1 G0,0 - - */ +/* - - - - - - - - - - B0,5 B0,4 B0,3 B0,2 B0,1 B0,0 - - */ +#define DISPLAY_PIXEL_CODING_DBI_18TO8 DISPLAY_PIXEL_CODING_DBI(18, 8, 0) +/* - - - - - - - - - - R0,7 R0,6 R0,5 R0,4 R0,3 R0,2 R0,1 R0,0 */ +/* - - - - - - - - - - G0,7 G0,6 G0,5 G0,4 G0,3 G0,2 G0,1 G0,0 */ +/* - - - - - - - - - - B0,7 B0,6 B0,5 B0,4 B0,3 B0,2 B0,1 B0,0 */ +#define DISPLAY_PIXEL_CODING_DBI_24TO8 DISPLAY_PIXEL_CODING_DBI(24, 8, 0) +/* - - - - - - - - - R0,5 R0,4 R0,3 R0,2 R0,1 R0,0 G0,5 G0,4 G0,4 */ +/* - - - - - - - - - G0,2 G0,1 G0,0 B0,5 B0,4 B0,3 B0,2 B0,1 B0,0 */ +#define DISPLAY_PIXEL_CODING_DBI_18TO9 DISPLAY_PIXEL_CODING_DBI(18, 9, 0) +/* - - R1,2 R1,1 R1,0 G1,2 G1,1 G1,0 B1,1 B1,0 R0,2 R0,1 R0,0 G0,2 G0,1 G0,0 B0,1 B0,0 */ +#define DISPLAY_PIXEL_CODING_DBI_8TO16 DISPLAY_PIXEL_CODING_DBI(8, 16, 0) +/* - - - - - - R0,3 R0,2 R0,1 R0,0 G0,3 G0,2 G0,1 G0,0 B0,3 B0,2 B0,1 B0,0 */ +#define DISPLAY_PIXEL_CODING_DBI_12TO16 DISPLAY_PIXEL_CODING_DBI(12, 16, 0) +/* - - R0,4 R0,3 R0,2 R0,1 R0,0 G0,5 G0,4 G0,3 G0,2 G0,1 G0,0 B0,4 B0,3 B0,2 B0,1 B0,0 */ +#define DISPLAY_PIXEL_CODING_DBI_16TO16 DISPLAY_PIXEL_CODING_DBI(16, 16, 0) +/* - - R0,5 R0,4 R0,3 R0,2 R0,1 R0,0 - - G0,5 G0,4 G0,3 G0,2 G0,1 G0,0 - - */ +/* - - B0,5 B0,4 B0,3 B0,2 B0,1 B0,0 - - R1,5 R1,4 R1,3 R1,2 R1,1 R1,0 - - */ +/* - - G1,5 G1,4 G1,3 G1,2 G1,1 G1,0 - - B1,5 B1,4 B1,3 B1,2 B1,1 B1,0 - - */ +#define DISPLAY_PIXEL_CODING_DBI_18TO16_A DISPLAY_PIXEL_CODING_DBI(18, 16, 0) +/* - - - - - - - - - - R0,5 R0,4 R0,3 R0,2 R0,1 R0,0 - - */ +/* - - G0,5 G0,4 G0,3 G0,2 G0,1 G0,0 - - B0,5 B0,4 B0,3 B0,2 B0,1 B0,0 - - */ +#define DISPLAY_PIXEL_CODING_DBI_18TO16_B DISPLAY_PIXEL_CODING_DBI(18, 16, 1) +/* - - R0,7 R0,6 R0,5 R0,4 R0,3 R0,2 R0,1 R0,0 G0,7 G0,6 G0,5 G0,4 G0,3 G0,2 G0,1 G0,0 */ +/* - - B0,7 B0,6 B0,5 B0,4 B0,3 B0,2 B0,1 B0,0 R1,7 R1,6 R1,5 R1,4 R1,3 R1,2 R1,1 R1,0 */ +/* - - G1,7 G1,6 G1,5 G1,4 G1,3 G1,2 G1,1 G1,0 B1,7 B1,6 B1,5 B1,4 B1,3 B1,2 B1,1 B1,0 */ +#define DISPLAY_PIXEL_CODING_DBI_24TO16_A DISPLAY_PIXEL_CODING_DBI(24, 16, 0) +/* - - - - - - - - - - R0,7 R0,6 R0,5 R0,4 R0,3 R0,2 R0,1 R0,0 */ +/* - - G0,7 G0,6 G0,5 G0,4 G0,3 G0,2 G0,1 G0,0 B0,7 B0,6 B0,5 B0,4 B0,3 B0,2 B0,1 B0,0 */ +#define DISPLAY_PIXEL_CODING_DBI_24TO16_B DISPLAY_PIXEL_CODING_DBI(24, 16, 1) + +/* Non-standard DBI pixel codings. */ +/* 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0 */ +/* - - - - - - - - - - R0,5 R0,4 R0,3 R0,2 R0,1 R0,0 G0,5 G0,4 */ +/* - - - - - - - - - - G0,3 G0,2 G0,1 G0,0 B0,5 B0,4 B0,3 B0,2 */ +/* - - - - - - - - - - - - - - - - B0,1 B0,0 */ +#define DISPLAY_PIXEL_CODING_DBI_18TO8_B DISPLAY_PIXEL_CODING_DBI(18, 8, 1) +/* - - - - - - - - - - - - - - - - R0,5 R0,4 */ +/* - - - - - - - - - - R0,3 R0,2 R0,1 R0,0 G0,5 G0,4 G0,3 G0,2 */ +/* - - - - - - - - - - G0,1 G0,0 B0,5 B0,4 B0,3 B0,2 B0,1 B0,0 */ +#define DISPLAY_PIXEL_CODING_DBI_18TO8_C DISPLAY_PIXEL_CODING_DBI(18, 8, 2) +/* - - R0,5 R0,4 R0,3 R0,2 R0,1 R0,0 G0,5 G0,4 G0,3 G0,2 G0,1 G0,0 B0,5 B0,4 B0,3 B0,2 */ +/* - - B0,1 B0,0 - - - - - - - - - - - - - - */ +#define DISPLAY_PIXEL_CODING_DBI_18TO16_C DISPLAY_PIXEL_CODING_DBI(18, 16, 2) +/* - - R0,5 R0,4 - - - - - - - - - - - - - - */ +/* - - R0,3 R0,2 R0,1 R0,0 G0,5 G0,4 G0,3 G0,2 G0,1 G0,0 B0,5 B0,4 B0,3 B0,2 B0,1 B0,0 */ +#define DISPLAY_PIXEL_CODING_DBI_18TO16_D DISPLAY_PIXEL_CODING_DBI(18, 16, 3) +/* - - - - - - R0,7 R0,6 R0,5 R0,4 R0,3 R0,2 R0,1 R0,0 G0,7 G0,6 G0,5 G0,4 */ +/* - - - - - - G0,3 G0,2 G0,1 G0,0 B0,7 B0,6 B0,5 B0,4 B0,3 B0,2 B0,1 B0,0 */ +#define DISPLAY_PIXEL_CODING_DBI_24TO12 DISPLAY_PIXEL_CODING_DBI(24, 12, 0) +/* R0,5 R0,4 R0,3 R0,2 R0,1 R0,0 G0,5 G0,4 G0,3 G0,2 G0,1 G0,0 B0,5 B0,4 B0,3 B0,2 B0,1 B0,0 */ +#define DISPLAY_PIXEL_CODING_DBI_18TO18 DISPLAY_PIXEL_CODING_DBI(18, 18, 0) + +/* DPI pixel codings. */ +#define DISPLAY_PIXEL_CODING_DPI_RGB(from, to, variant) \ + DISPLAY_PIXEL_CODING_TYPE(DISPLAY_PIXEL_CODING_TYPE_DPI, \ + from, to, variant, 0) +#define DISPLAY_PIXEL_CODING_DPI_YUV(from, to, variant) \ + DISPLAY_PIXEL_CODING_TYPE(DISPLAY_PIXEL_CODING_TYPE_DPI, \ + from, to, variant, 1) + +/* Standard DPI codings, defined in the DPI specification. */ +/* 23 22 21 20 19 28 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0 */ +/* - - - - - - - - R4 R3 R2 R1 R0 G5 G4 G3 G2 G1 G0 B4 B3 B2 B1 B0 */ +#define DISPLAY_PIXEL_CODING_DPI_RGB_16TO16 DISPLAY_PIXEL_CODING_DPI_RGB(16, 16, 0) +/* - - - - - - R5 R4 R3 R2 R1 R0 G5 G4 G3 G2 G1 G0 B5 B4 B3 B2 B1 B0 */ +#define DISPLAY_PIXEL_CODING_DPI_RGB_18TO18 DISPLAY_PIXEL_CODING_DPI_RGB(18, 18, 0) +/* - - - R4 R3 R2 R1 R0 - - G5 G4 G3 G2 G1 G0 - - - B4 B3 B2 B1 B0 */ +#define DISPLAY_PIXEL_CODING_DPI_RGB_16TO20 DISPLAY_PIXEL_CODING_DPI_RGB(16, 20, 0) +/* - - R4 R3 R2 R1 R0 - - - G5 G4 G3 G2 G1 G0 - - B4 B3 B2 B1 B0 - */ +#define DISPLAY_PIXEL_CODING_DPI_RGB_16TO22 DISPLAY_PIXEL_CODING_DPI_RGB(16, 22, 0) +/* - - R5 R4 R3 R2 R1 R0 - - G5 G4 G3 G2 G1 G0 - - B5 B4 B3 B2 B1 B0 */ +#define DISPLAY_PIXEL_CODING_DPI_RGB_18TO22 DISPLAY_PIXEL_CODING_DPI_RGB(18, 22, 0) +/* R7 R6 R5 R4 R3 R2 R1 R0 G7 G6 G5 G4 G3 G2 G1 G0 B7 B6 B5 B4 B3 B2 B1 B0 */ +#define DISPLAY_PIXEL_CODING_DPI_RGB_24TO24 DISPLAY_PIXEL_CODING_DPI_RGB(24, 24, 0) + +/* Non-standard DPI pixel codings. */ +/* 23 22 21 20 19 28 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0 */ +/* - - - - - - - - - - - - - - - - R7 R6 R5 R4 R3 R2 R1 R0 */ +/* - - - - - - - - - - - - - - - - G7 G6 G5 G4 G3 G2 G1 G0 */ +/* - - - - - - - - - - - - - - - - B7 B6 B5 B4 B3 B2 B1 B0 */ +#define DISPLAY_PIXEL_CODING_DPI_RGB_24TO8 DISPLAY_PIXEL_CODING_DPI_RGB(24, 8, 0) +/* - - - - - - - - - - - - - - - R5 R4 R3 R2 R1 R0 G5 G4 G3 */ +/* - - - - - - - - - - - - - - - G2 G1 G0 B5 B4 B3 B2 B1 B0 */ +#define DISPLAY_PIXEL_CODING_DPI_RGB_18TO9 DISPLAY_PIXEL_CODING_DPI_RGB(18, 9, 0) +/* - - - - - - - - - - - - R3 R2 R1 R0 G3 G2 G1 G0 B3 B2 B1 B0 */ +#define DISPLAY_PIXEL_CODING_DPI_RGB_12TO12 DISPLAY_PIXEL_CODING_DPI_RGB(12, 12, 0) +/* - - - - - - - - - - - - R7 R6 R5 R4 R3 R2 R1 R0 G7 G6 G5 G4 */ +/* - - - - - - - - - - - - G3 G2 G1 G0 B7 B6 B5 B4 B3 B2 B1 B0 */ +#define DISPLAY_PIXEL_CODING_DPI_RGB_24TO12 DISPLAY_PIXEL_CODING_DPI_RGB(24, 12, 0) + /* ----------------------------------------------------------------------------- * Display Entity */

The Display Pixel Interface is a configurable-width video-only unidirectional parallel bus standard that defines video formats and signaling for panel devices.

This driver implements support for simple DPI panels with no runtime configuration capabilities (GPIOs- and/or regulators-based control can be implemented later when needed) and exposes it as a display entity. The panel native video mode is passed to the driver through platform data or device tree properties.

Signed-off-by: Laurent Pinchart laurent.pinchart@ideasonboard.com --- drivers/video/display/Kconfig | 10 ++ drivers/video/display/Makefile | 1 + drivers/video/display/panel-dpi.c | 207 ++++++++++++++++++++++++++++++++++++++ include/video/panel-dpi.h | 24 +++++ 4 files changed, 242 insertions(+) create mode 100644 drivers/video/display/panel-dpi.c create mode 100644 include/video/panel-dpi.h

diff --git a/drivers/video/display/Kconfig b/drivers/video/display/Kconfig index f7532c1..bce09d6 100644 --- a/drivers/video/display/Kconfig +++ b/drivers/video/display/Kconfig @@ -9,4 +9,14 @@ config DISPLAY_MIPI_DBI tristate default n

+config DISPLAY_PANEL_DPI + tristate "DPI (Parallel) Display Panels" + ---help--- + Support for simple digital (parallel) pixel interface panels. Those + panels receive pixel data through a parallel bus and have no control + bus. + + If you are in doubt, say N. To compile this driver as a module, choose + M here; the module will be called panel-dpi. + endif # DISPLAY_CORE diff --git a/drivers/video/display/Makefile b/drivers/video/display/Makefile index 59022d2..31c017b 100644 --- a/drivers/video/display/Makefile +++ b/drivers/video/display/Makefile @@ -2,3 +2,4 @@ display-y := display-core.o \ display-notifier.o obj-$(CONFIG_DISPLAY_CORE) += display.o obj-$(CONFIG_DISPLAY_MIPI_DBI) += mipi-dbi-bus.o +obj-$(CONFIG_DISPLAY_PANEL_DPI) += panel-dpi.o diff --git a/drivers/video/display/panel-dpi.c b/drivers/video/display/panel-dpi.c new file mode 100644 index 0000000..b1ecf6d --- /dev/null +++ b/drivers/video/display/panel-dpi.c @@ -0,0 +1,207 @@ +/* + * DPI Display Panel + * + * Copyright (C) 2012 Renesas Solutions Corp. + * + * Contacts: Laurent Pinchart laurent.pinchart@ideasonboard.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/slab.h> + +#include <video/display.h> +#include <video/of_display_timing.h> +#include <video/of_videomode.h> +#include <video/panel-dpi.h> +#include <video/videomode.h> + +struct panel_dpi { + struct display_entity entity; + + unsigned int width; + unsigned int height; + struct videomode mode; +}; + +static inline struct panel_dpi *to_panel_dpi(struct display_entity *e) +{ + return container_of(e, struct panel_dpi, entity); +} + +static const struct display_entity_interface_params panel_dpi_params = { + .type = DISPLAY_ENTITY_INTERFACE_DPI, +}; + +static int panel_dpi_set_state(struct display_entity *entity, + enum display_entity_state state) +{ + struct media_pad *source; + + source = media_entity_remote_pad(&entity->entity.pads[0]); + if (source == NULL) + return -EPIPE; + + switch (state) { + case DISPLAY_ENTITY_STATE_OFF: + case DISPLAY_ENTITY_STATE_STANDBY: + display_entity_set_stream(to_display_entity(source->entity), + source->index, + DISPLAY_ENTITY_STREAM_STOPPED); + break; + + case DISPLAY_ENTITY_STATE_ON: + display_entity_set_stream(to_display_entity(source->entity), + source->index, + DISPLAY_ENTITY_STREAM_CONTINUOUS); + break; + } + + return 0; +} + +static int panel_dpi_get_modes(struct display_entity *entity, unsigned int port, + const struct videomode **modes) +{ + struct panel_dpi *panel = to_panel_dpi(entity); + + *modes = &panel->mode; + return 1; +} + +static int panel_dpi_get_size(struct display_entity *entity, + unsigned int *width, unsigned int *height) +{ + struct panel_dpi *panel = to_panel_dpi(entity); + + *width = panel->width; + *height = panel->height; + return 0; +} + +static int panel_dpi_get_params(struct display_entity *entity, + unsigned int port, + struct display_entity_interface_params *params) +{ + *params = panel_dpi_params; + return 0; +} + +static const struct display_entity_control_ops panel_dpi_control_ops = { + .set_state = panel_dpi_set_state, + .get_modes = panel_dpi_get_modes, + .get_size = panel_dpi_get_size, + .get_params = panel_dpi_get_params, +}; + +static const struct display_entity_ops panel_dpi_ops = { + .ctrl = &panel_dpi_control_ops, +}; + +static int panel_dpi_remove(struct platform_device *pdev) +{ + struct panel_dpi *panel = platform_get_drvdata(pdev); + + display_entity_remove(&panel->entity); + display_entity_cleanup(&panel->entity); + + return 0; +} + +static int panel_dpi_parse_pdata(struct panel_dpi *panel, + struct platform_device *pdev) +{ + const struct panel_dpi_platform_data *pdata = pdev->dev.platform_data; + struct device_node *np = pdev->dev.of_node; + int ret; + + if (pdata) { + panel->width = pdata->width; + panel->height = pdata->height; + panel->mode = *pdata->mode; + } else if (IS_ENABLED(CONFIG_OF) && np) { + /* Width and height are optional. */ + of_property_read_u32(np, "width-mm", &panel->width); + of_property_read_u32(np, "height-mm", &panel->height); + + ret = of_get_videomode(np, &panel->mode, OF_USE_NATIVE_MODE); + if (ret < 0) + return ret; + } else { + dev_err(&pdev->dev, "no platform data\n"); + return -EINVAL; + } + + return 0; +} + +static int panel_dpi_probe(struct platform_device *pdev) +{ + struct panel_dpi *panel; + int ret; + + panel = devm_kzalloc(&pdev->dev, sizeof(*panel), GFP_KERNEL); + if (panel == NULL) + return -ENOMEM; + + ret = panel_dpi_parse_pdata(panel, pdev); + if (ret < 0) + return ret; + + panel->entity.dev = &pdev->dev; + panel->entity.ops = &panel_dpi_ops; + strlcpy(panel->entity.name, "panel-dpi", sizeof(panel->entity.name)); + + ret = display_entity_init(&panel->entity, 1, 0); + if (ret < 0) + return ret; + + ret = display_entity_add(&panel->entity); + if (ret < 0) + return ret; + + platform_set_drvdata(pdev, panel); + + return 0; +} + +static const struct dev_pm_ops panel_dpi_dev_pm_ops = { +}; + +static struct platform_device_id panel_dpi_id_table[] = { + { "panel-dpi", 0 }, + { }, +}; +MODULE_DEVICE_TABLE(platform, panel_dpi_id_table); + +#ifdef CONFIG_OF +static struct of_device_id panel_dpi_of_id_table[] = { + { .compatible = "panel-dpi", }, + { }, +}; +MODULE_DEVICE_TABLE(of, panel_dpi_of_id_table); +#endif + +static struct platform_driver panel_dpi_driver = { + .probe = panel_dpi_probe, + .remove = panel_dpi_remove, + .id_table = panel_dpi_id_table, + .driver = { + .name = "panel-dpi", + .owner = THIS_MODULE, + .pm = &panel_dpi_dev_pm_ops, + .of_match_table = of_match_ptr(panel_dpi_of_id_table), + }, +}; + +module_platform_driver(panel_dpi_driver); + +MODULE_AUTHOR("Laurent Pinchart laurent.pinchart@ideasonboard.com"); +MODULE_DESCRIPTION("DPI Display Panel"); +MODULE_LICENSE("GPL"); diff --git a/include/video/panel-dpi.h b/include/video/panel-dpi.h new file mode 100644 index 0000000..af85d5b --- /dev/null +++ b/include/video/panel-dpi.h @@ -0,0 +1,24 @@ +/* + * DPI Display Panel + * + * Copyright (C) 2012 Renesas Solutions Corp. + * + * Contacts: Laurent Pinchart laurent.pinchart@ideasonboard.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef __PANEL_DPI_H__ +#define __PANEL_DPI_H__ + +struct videomode; + +struct panel_dpi_platform_data { + unsigned long width; /* Panel width in mm */ + unsigned long height; /* Panel height in mm */ + const struct videomode *mode; +}; + +#endif /* __PANEL_DPI_H__ */

The R61517 is a MIPI DBI panel controller from Renesas.

Signed-off-by: Laurent Pinchart laurent.pinchart@ideasonboard.com --- drivers/video/display/Kconfig | 10 + drivers/video/display/Makefile | 1 + drivers/video/display/panel-r61517.c | 460 +++++++++++++++++++++++++++++++++++ include/video/panel-r61517.h | 28 +++ 4 files changed, 499 insertions(+) create mode 100644 drivers/video/display/panel-r61517.c create mode 100644 include/video/panel-r61517.h

diff --git a/drivers/video/display/Kconfig b/drivers/video/display/Kconfig index 76729ef..9b44b5f 100644 --- a/drivers/video/display/Kconfig +++ b/drivers/video/display/Kconfig @@ -29,4 +29,14 @@ config DISPLAY_PANEL_R61505 If you are in doubt, say N. To compile this driver as a module, choose M here; the module will be called panel-r61505.

+config DISPLAY_PANEL_R61517 + tristate "Renesas R61517-based Display Panel" + select DISPLAY_MIPI_DBI + ---help--- + Support panels based on the Renesas R61517 panel controller. + Those panels are controlled through a MIPI DBI interface. + + If you are in doubt, say N. To compile this driver as a module, choose + M here; the module will be called panel-r61517. + endif # DISPLAY_CORE diff --git a/drivers/video/display/Makefile b/drivers/video/display/Makefile index db8a4c3..1cdc8d4 100644 --- a/drivers/video/display/Makefile +++ b/drivers/video/display/Makefile @@ -4,3 +4,4 @@ obj-$(CONFIG_DISPLAY_CORE) += display.o obj-$(CONFIG_DISPLAY_MIPI_DBI) += mipi-dbi-bus.o obj-$(CONFIG_DISPLAY_PANEL_DPI) += panel-dpi.o obj-$(CONFIG_DISPLAY_PANEL_R61505) += panel-r61505.o +obj-$(CONFIG_DISPLAY_PANEL_R61517) += panel-r61517.o diff --git a/drivers/video/display/panel-r61517.c b/drivers/video/display/panel-r61517.c new file mode 100644 index 0000000..ccfec33 --- /dev/null +++ b/drivers/video/display/panel-r61517.c @@ -0,0 +1,460 @@ +/* + * Renesas R61517-based Display Panels + * + * Copyright (C) 2012 Renesas Solutions Corp. + * Based on KFR2R09 LCD panel support + * Copyright (C) 2009 Magnus Damm + * Register settings based on the out-of-tree t33fb.c driver + * Copyright (C) 2008 Lineo Solutions, Inc. + * + * Contacts: Laurent Pinchart laurent.pinchart@ideasonboard.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/fb.h> +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/gpio.h> + +#include <video/display.h> +#include <video/mipi-dbi-bus.h> +#include <video/mipi_display.h> +#include <video/panel-r61517.h> +#include <video/videomode.h> + +struct r61517 { + struct display_entity entity; + struct mipi_dbi_device *dbi; + const struct panel_r61517_platform_data *pdata; +}; + +static inline struct r61517 *to_panel(struct display_entity *e) +{ + return container_of(e, struct r61517, entity); +} + +/* ----------------------------------------------------------------------------- + * Read, write and reset + */ + +static void r61517_write_command(struct r61517 *panel, u16 cmd) +{ + mipi_dbi_write_command(panel->dbi, cmd); +} + +static void r61517_write_data(struct r61517 *panel, u8 data) +{ + mipi_dbi_write_data(panel->dbi, &data, 1); +} + +static int r61517_read_data(struct r61517 *panel) +{ + u8 data; + int ret; + + ret = mipi_dbi_read_data(panel->dbi, &data, 1); + if (ret < 0) + return ret; + + return data; +} + +static void r61517_write(struct r61517 *panel, u8 reg, const u8 *data, + size_t len) +{ + mipi_dbi_write_command(panel->dbi, reg); + mipi_dbi_write_data(panel->dbi, data, len); +} + +static void r61517_write8(struct r61517 *panel, u8 reg, u8 data) +{ + r61517_write(panel, reg, &data, 1); +} + +static void r61517_write16(struct r61517 *panel, u8 reg, u16 data) +{ + u8 buffer[2] = { (data >> 8) & 0xff, (data >> 0) & 0xff }; + + r61517_write(panel, reg, buffer, 2); +} + +static void r61517_write32(struct r61517 *panel, u8 reg, u32 data) +{ + u8 buffer[4] = { (data >> 24) & 0xff, (data >> 16) & 0xff, + (data >> 8) & 0xff, (data >> 0) & 0xff }; + + r61517_write(panel, reg, buffer, 4); +} + +#define r61517_write_array(p, c, a) \ + r61517_write((p), (c), (a), ARRAY_SIZE(a)) + +static void r61517_reset(struct r61517 *panel) +{ + gpio_set_value(panel->pdata->protect, 0); /* PROTECT/ -> L */ + gpio_set_value(panel->pdata->reset, 0); /* LCD_RST/ -> L */ + gpio_set_value(panel->pdata->protect, 1); /* PROTECT/ -> H */ + usleep_range(1100, 1200); + gpio_set_value(panel->pdata->reset, 1); /* LCD_RST/ -> H */ + usleep_range(10, 100); + gpio_set_value(panel->pdata->protect, 0); /* PROTECT/ -> L */ + msleep(20); +} + +/* ----------------------------------------------------------------------------- + * Configuration + */ + +static const u8 data_frame_if[] = { + 0x02, /* WEMODE: 1=cont, 0=one-shot */ + 0x00, 0x00, + 0x00, /* EPF, DFM */ + 0x02, /* RIM[1] : 1 (18bpp) */ +}; + +static const u8 data_panel[] = { + 0x0b, + 0x63, /* 400 lines */ + 0x04, 0x00, 0x00, 0x04, 0x11, 0x00, 0x00, +}; + +static const u8 data_timing[] = { + 0x00, 0x00, 0x13, 0x08, 0x08, +}; + +static const u8 data_timing_src[] = { + 0x11, 0x01, 0x00, 0x01, +}; + +static const u8 data_gamma[] = { + 0x01, 0x02, 0x08, 0x23, 0x03, 0x0c, 0x00, 0x06, 0x00, 0x00, + 0x01, 0x00, 0x0c, 0x23, 0x03, 0x08, 0x02, 0x06, 0x00, 0x00, +}; + +static const u8 data_power[] = { + 0x07, 0xc5, 0xdc, 0x02, 0x33, 0x0a, +}; + +static const u8 data_vcom[] = { + 0x00, 0x0f, 0x02, +}; + +static unsigned long r61517_read_device_code(struct r61517 *panel) +{ + /* access protect OFF */ + r61517_write8(panel, 0xb0, 0); + + /* deep standby OFF */ + r61517_write8(panel, 0xb1, 0); + + /* device code command */ + r61517_write_command(panel, 0xbf); + mdelay(50); + + /* dummy read */ + r61517_read_data(panel); + + /* read device code */ + return (r61517_read_data(panel) << 24) | + (r61517_read_data(panel) << 16) | + (r61517_read_data(panel) << 8) | + (r61517_read_data(panel) << 0); +} + +static void r61517_write_memory_start(struct r61517 *panel) +{ + r61517_write_command(panel, MIPI_DCS_WRITE_MEMORY_START); +} + +static void r61517_clear_memory(struct r61517 *panel) +{ + unsigned int size = panel->pdata->mode->hactive + * panel->pdata->mode->vactive; + unsigned int i; + + r61517_write_memory_start(panel); + + for (i = 0; i < size; i++) + r61517_write_data(panel, 0); +} + +static void r61517_enable_panel(struct r61517 *panel) +{ + /* access protect off */ + r61517_write8(panel, 0xb0, 0); + + /* exit deep standby mode */ + r61517_write8(panel, 0xb1, 0); + + /* frame memory I/F */ + r61517_write_array(panel, 0xb3, data_frame_if); + + /* display mode and frame memory write mode */ + r61517_write8(panel, 0xb4, 0); /* DBI, internal clock */ + + /* panel */ + r61517_write_array(panel, 0xc0, data_panel); + + /* timing (normal) */ + r61517_write_array(panel, 0xc1, data_timing); + + /* timing (partial) */ + r61517_write_array(panel, 0xc2, data_timing); + + /* timing (idle) */ + r61517_write_array(panel, 0xc3, data_timing); + + /* timing (source/VCOM/gate driving) */ + r61517_write_array(panel, 0xc4, data_timing_src); + + /* gamma (red) */ + r61517_write_array(panel, 0xc8, data_gamma); + + /* gamma (green) */ + r61517_write_array(panel, 0xc9, data_gamma); + + /* gamma (blue) */ + r61517_write_array(panel, 0xca, data_gamma); + + /* power (common) */ + r61517_write_array(panel, 0xd0, data_power); + + /* VCOM */ + r61517_write_array(panel, 0xd1, data_vcom); + + /* power (normal) */ + r61517_write16(panel, 0xd2, 0x6324); + + /* power (partial) */ + r61517_write16(panel, 0xd3, 0x6324); + + /* power (idle) */ + r61517_write16(panel, 0xd4, 0x6324); + + r61517_write16(panel, 0xd8, 0x7777); + + /* TE signal */ + r61517_write8(panel, MIPI_DCS_SET_TEAR_ON, 0); + + /* TE signal line */ + r61517_write16(panel, MIPI_DCS_SET_TEAR_SCANLINE, 0); + + /* column address */ + r61517_write32(panel, MIPI_DCS_SET_COLUMN_ADDRESS, + panel->pdata->mode->hactive - 1); + + /* page address */ + r61517_write32(panel, MIPI_DCS_SET_PAGE_ADDRESS, + panel->pdata->mode->vactive - 1); + + /* exit sleep mode */ + r61517_write_command(panel, MIPI_DCS_EXIT_SLEEP_MODE); + + mdelay(120); + + /* clear vram */ + r61517_clear_memory(panel); +} + +static void r61517_disable_panel(struct r61517 *panel) +{ + r61517_reset(panel); +} + +static void r61517_display_on(struct r61517 *panel) +{ + r61517_write_command(panel, MIPI_DCS_SET_DISPLAY_ON); + mdelay(1); +} + +static void r61517_display_off(struct r61517 *panel) +{ + r61517_write_command(panel, MIPI_DCS_SET_DISPLAY_OFF); +} + +/* ----------------------------------------------------------------------------- + * Panel operations + */ + +static const struct display_entity_interface_params r61517_dbi_params = { + .type = DISPLAY_ENTITY_INTERFACE_DBI, + .p.dbi = { + .type = MIPI_DBI_INTERFACE_TYPE_B, + .flags = MIPI_DBI_INTERFACE_TE, + .cs_setup = 1, + .wr_setup = 1, + .wr_cycle = 9, + .wr_hold = 4, + .rd_setup = 1, + .rd_latch = 20, + .rd_cycle = 41, + .rd_hold = 20, + }, +}; + +static int r61517_set_state(struct display_entity *entity, + enum display_entity_state state) +{ + struct r61517 *panel = to_panel(entity); + + switch (state) { + case DISPLAY_ENTITY_STATE_OFF: + r61517_disable_panel(panel); + break; + + case DISPLAY_ENTITY_STATE_STANDBY: + if (entity->state == DISPLAY_ENTITY_STATE_OFF) + r61517_enable_panel(panel); + else + r61517_display_off(panel); + break; + + case DISPLAY_ENTITY_STATE_ON: + if (entity->state == DISPLAY_ENTITY_STATE_OFF) + r61517_enable_panel(panel); + + r61517_display_on(panel); + break; + } + + return 0; +} + +static int r61517_update(struct display_entity *entity) +{ + struct r61517 *panel = to_panel(entity); + struct media_pad *source; + + r61517_write_memory_start(panel); + + source = media_entity_remote_pad(&entity->entity.pads[0]); + if (source == NULL) + return -EPIPE; + + display_entity_set_stream(to_display_entity(source->entity), + source->index, + DISPLAY_ENTITY_STREAM_SINGLE_SHOT); + return 0; +} + +static int r61517_get_modes(struct display_entity *entity, unsigned int port, + const struct videomode **modes) +{ + struct r61517 *panel = to_panel(entity); + + *modes = panel->pdata->mode; + return 1; +} + +static int r61517_get_size(struct display_entity *entity, + unsigned int *width, unsigned int *height) +{ + struct r61517 *panel = to_panel(entity); + + *width = panel->pdata->width; + *height = panel->pdata->height; + return 0; +} + +static int r61517_get_params(struct display_entity *entity, unsigned int port, + struct display_entity_interface_params *params) +{ + *params = r61517_dbi_params; + return 0; +} + +static const struct display_entity_control_ops r61517_control_ops = { + .set_state = r61517_set_state, + .update = r61517_update, + .get_modes = r61517_get_modes, + .get_size = r61517_get_size, + .get_params = r61517_get_params, +}; + +static const struct display_entity_ops r61517_ops = { + .ctrl = &r61517_control_ops, +}; + +static int r61517_remove(struct mipi_dbi_device *dev) +{ + struct r61517 *panel = mipi_dbi_get_drvdata(dev); + + display_entity_remove(&panel->entity); + display_entity_cleanup(&panel->entity); + + return 0; +} + +static int r61517_probe(struct mipi_dbi_device *dev) +{ + const struct panel_r61517_platform_data *pdata = dev->dev.platform_data; + struct r61517 *panel; + int ret; + + if (pdata == NULL) + return -ENODEV; + + panel = devm_kzalloc(&dev->dev, sizeof(*panel), GFP_KERNEL); + if (panel == NULL) + return -ENOMEM; + + panel->pdata = pdata; + panel->dbi = dev; + + dev->bus_width = pdata->bus_width; + mipi_dbi_set_data_width(dev, 8); + + r61517_reset(panel); + + if (r61517_read_device_code(panel) != 0x01221517) + return -ENODEV; + + pr_info("R61517 panel controller detected.\n"); + + panel->entity.dev = &dev->dev; + panel->entity.ops = &r61517_ops; + + ret = display_entity_init(&panel->entity, 1, 0); + if (ret < 0) + return ret; + + ret = display_entity_add(&panel->entity); + if (ret < 0) + return ret; + + mipi_dbi_set_drvdata(dev, panel); + + return 0; +} + +static const struct dev_pm_ops r61517_dev_pm_ops = { +}; + +static struct mipi_dbi_device_id r61517_id_table[] = { + { "panel-r61517", 0 }, + { }, +}; +MODULE_DEVICE_TABLE(mipi_dbi, r61517_id_table); + +static struct mipi_dbi_driver r61517_driver = { + .probe = r61517_probe, + .remove = r61517_remove, + .id_table = r61517_id_table, + .driver = { + .name = "panel-r61517", + .owner = THIS_MODULE, + .pm = &r61517_dev_pm_ops, + }, +}; + +module_mipi_dbi_driver(r61517_driver); + +MODULE_AUTHOR("Laurent Pinchart laurent.pinchart@ideasonboard.com"); +MODULE_DESCRIPTION("Renesas R61517-based Display Panel"); +MODULE_LICENSE("GPL"); diff --git a/include/video/panel-r61517.h b/include/video/panel-r61517.h new file mode 100644 index 0000000..33f16af --- /dev/null +++ b/include/video/panel-r61517.h @@ -0,0 +1,28 @@ +/* + * Renesas R61517-based Display Panels + * + * Copyright (C) 2012 Renesas Solutions Corp. + * + * Contacts: Laurent Pinchart laurent.pinchart@ideasonboard.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef __PANEL_R61517_H__ +#define __PANEL_R61517_H__ + +struct videomode; + +struct panel_r61517_platform_data { + unsigned long width; /* Panel width in mm */ + unsigned long height; /* Panel height in mm */ + const struct videomode *mode; + + unsigned int bus_width; + int protect; /* Protect GPIO */ + int reset; /* Reset GPIO */ +}; + +#endif /* __PANEL_R61517_H__ */

This driver exposes VGA connectors as display entity devices. The connectors are passive devices that pass analog VGA signals though. They optionally cary DDC signals for bidirectional control communications with the devices connected to the connectors.

EDID retrieval isn't supported yet.

Signed-off-by: Laurent Pinchart laurent.pinchart+renesas@ideasonboard.com --- drivers/video/display/Kconfig | 11 +++ drivers/video/display/Makefile | 1 + drivers/video/display/con-vga.c | 148 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 160 insertions(+) create mode 100644 drivers/video/display/con-vga.c

diff --git a/drivers/video/display/Kconfig b/drivers/video/display/Kconfig index 32ce08d..9b482a8 100644 --- a/drivers/video/display/Kconfig +++ b/drivers/video/display/Kconfig @@ -5,6 +5,17 @@ menuconfig DISPLAY_CORE

if DISPLAY_CORE

+ +config DISPLAY_CONNECTOR_VGA + tristate "VGA Connector" + ---help--- + Support for simple digital (parallel) pixel interface panels. Those + panels receive pixel data through a parallel bus and have no control + bus. + + If you are in doubt, say N. To compile this driver as a module, choose + M here; the module will be called con-vga. + config DISPLAY_MIPI_DBI tristate default n diff --git a/drivers/video/display/Makefile b/drivers/video/display/Makefile index 43cd78d..d03c64a 100644 --- a/drivers/video/display/Makefile +++ b/drivers/video/display/Makefile @@ -1,6 +1,7 @@ display-y := display-core.o \ display-notifier.o obj-$(CONFIG_DISPLAY_CORE) += display.o +obj-$(CONFIG_DISPLAY_CONNECTOR_VGA) += con-vga.o obj-$(CONFIG_DISPLAY_MIPI_DBI) += mipi-dbi-bus.o obj-$(CONFIG_DISPLAY_PANEL_DPI) += panel-dpi.o obj-$(CONFIG_DISPLAY_PANEL_R61505) += panel-r61505.o diff --git a/drivers/video/display/con-vga.c b/drivers/video/display/con-vga.c new file mode 100644 index 0000000..798ac9e --- /dev/null +++ b/drivers/video/display/con-vga.c @@ -0,0 +1,148 @@ +/* + * VGA Connector + * + * Copyright (C) 2013 Renesas Solutions Corp. + * + * Contacts: Laurent Pinchart laurent.pinchart@ideasonboard.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/slab.h> + +#include <video/display.h> + +struct con_vga { + struct display_entity entity; +}; + +static int con_vga_set_state(struct display_entity *entity, + enum display_entity_state state) +{ + struct media_pad *source; + + source = media_entity_remote_pad(&entity->entity.pads[0]); + if (source == NULL) + return -EPIPE; + + switch (state) { + case DISPLAY_ENTITY_STATE_OFF: + case DISPLAY_ENTITY_STATE_STANDBY: + display_entity_set_stream(to_display_entity(source->entity), + source->index, + DISPLAY_ENTITY_STREAM_STOPPED); + break; + + case DISPLAY_ENTITY_STATE_ON: + display_entity_set_stream(to_display_entity(source->entity), + source->index, + DISPLAY_ENTITY_STREAM_CONTINUOUS); + break; + } + + return 0; +} + +static int con_vga_get_modes(struct display_entity *entity, unsigned int port, + const struct videomode **modes) +{ + /* TODO: Add EDID retrieval support. */ + return 0; +} + +static int con_vga_get_params(struct display_entity *entity, unsigned int port, + struct display_entity_interface_params *params) +{ + memset(params, 0, sizeof(*params)); + + params->type = DISPLAY_ENTITY_INTERFACE_VGA; + + return 0; +} + +static const struct display_entity_control_ops con_vga_control_ops = { + .set_state = con_vga_set_state, + .get_modes = con_vga_get_modes, + .get_params = con_vga_get_params, +}; + +static const struct display_entity_ops con_vga_ops = { + .ctrl = &con_vga_control_ops, +}; + +static int con_vga_remove(struct platform_device *pdev) +{ + struct con_vga *con = platform_get_drvdata(pdev); + + display_entity_remove(&con->entity); + display_entity_cleanup(&con->entity); + + return 0; +} + +static int con_vga_probe(struct platform_device *pdev) +{ + struct con_vga *con; + int ret; + + con = devm_kzalloc(&pdev->dev, sizeof(*con), GFP_KERNEL); + if (con == NULL) + return -ENOMEM; + + con->entity.dev = &pdev->dev; + con->entity.ops = &con_vga_ops; + strlcpy(con->entity.name, "vga-con", sizeof(con->entity.name)); + + ret = display_entity_init(&con->entity, 1, 0); + if (ret < 0) + return ret; + + ret = display_entity_add(&con->entity); + if (ret < 0) + return ret; + + platform_set_drvdata(pdev, con); + + return 0; +} + +static const struct dev_pm_ops con_vga_dev_pm_ops = { +}; + +static struct platform_device_id con_vga_id_table[] = { + { "con-vga", 0 }, + { }, +}; +MODULE_DEVICE_TABLE(platform, con_vga_id_table); + +#ifdef CONFIG_OF +static struct of_device_id con_vga_of_id_table[] = { + { .compatible = "con-vga", }, + { }, +}; +MODULE_DEVICE_TABLE(of, con_vga_of_id_table); +#endif + +static struct platform_driver con_vga_driver = { + .probe = con_vga_probe, + .remove = con_vga_remove, + .id_table = con_vga_id_table, + .driver = { + .name = "con-vga", + .owner = THIS_MODULE, + .pm = &con_vga_dev_pm_ops, + .of_match_table = of_match_ptr(con_vga_of_id_table), + }, +}; + +module_platform_driver(con_vga_driver); + +MODULE_AUTHOR("Laurent Pinchart laurent.pinchart@ideasonboard.com"); +MODULE_DESCRIPTION("VGA Connector"); +MODULE_LICENSE("GPL");

Signed-off-by: Laurent Pinchart laurent.pinchart+renesas@ideasonboard.com --- arch/arm/boot/dts/r8a7790.dtsi | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi index ab0582c..b63f1a6 100644 --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi @@ -186,4 +186,37 @@ reg = <0 0xe6060000 0 0x250>; #gpio-range-cells = <3>; }; + + du: display@feb00000 { + compatible = "renesas,du-r8a7790"; + reg = <0 0xfeb00000 0 0x70000>, + <0 0xfeb90000 0 0x1c>, + <0 0xfeb94000 0 0x1c>; + reg-names = "core", "lvds.0", "lvds.1"; + interrupt-parent = <&gic>; + interrupts = <0 256 4 + 0 268 4 + 0 269 4>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + du_out_rgb: endpoint { + }; + }; + port@1 { + reg = <1>; + du_out_lvds0: endpoint { + }; + }; + port@2 { + reg = <2>; + du_out_lvds1: endpoint { + }; + }; + }; + }; };

Signed-off-by: Laurent Pinchart laurent.pinchart+renesas@ideasonboard.com --- arch/arm/mach-shmobile/board-lager.c | 76 +++++++++++++++++++++++++----------- 1 file changed, 53 insertions(+), 23 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c index 75a01bc..d61b892 100644 --- a/arch/arm/mach-shmobile/board-lager.c +++ b/arch/arm/mach-shmobile/board-lager.c @@ -33,6 +33,8 @@ #include <linux/regulator/fixed.h> #include <linux/regulator/machine.h> #include <linux/sh_eth.h> +#include <video/panel-dpi.h> +#include <video/videomode.h> #include <mach/common.h> #include <mach/irqs.h> #include <mach/r8a7790.h> @@ -40,35 +42,56 @@ #include <asm/mach/arch.h>

/* DU */ -static struct rcar_du_encoder_data lager_du_encoders[] = { +static const struct videomode lager_panel_mode = { + .pixelclock = 65000000, + .hactive = 1024, + .hfront_porch = 24, + .hback_porch = 160, + .hsync_len = 136, + .vactive = 768, + .vfront_porch = 3, + .vback_porch = 29, + .vsync_len = 6, + .flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW, +}; + +static const struct panel_dpi_platform_data lager_panel_data = { + .width = 210, + .height = 158, + .mode = &lager_panel_mode, +}; + +static const struct display_entity_graph_data lager_du_entities[] = { { - .type = RCAR_DU_ENCODER_VGA, - .output = RCAR_DU_OUTPUT_DPAD0, + .name = "adv7123", + .sources = (const struct display_entity_source_data[]) { + { + .name = "rcar-du", + .port = 0, + }, + }, }, { - .type = RCAR_DU_ENCODER_NONE, - .output = RCAR_DU_OUTPUT_LVDS1, - .connector.lvds.panel = { - .width_mm = 210, - .height_mm = 158, - .mode = { - .clock = 65000, - .hdisplay = 1024, - .hsync_start = 1048, - .hsync_end = 1184, - .htotal = 1344, - .vdisplay = 768, - .vsync_start = 771, - .vsync_end = 777, - .vtotal = 806, - .flags = 0, + .name = "con-vga", + .sources = (const struct display_entity_source_data[]) { + { + .name = "adv7123", + .port = 1, }, }, + }, { + .name = "panel-dpi", + .sources = (const struct display_entity_source_data[]) { + { + .name = "rcar-du", + .port = 2, + }, + }, + }, { }, };

static const struct rcar_du_platform_data lager_du_pdata __initconst = { - .encoders = lager_du_encoders, - .num_encoders = ARRAY_SIZE(lager_du_encoders), + .graph = lager_du_entities, };

static const struct resource du_resources[] __initconst = { @@ -87,8 +110,8 @@ static void __init lager_add_du_device(void) .id = -1, .res = du_resources, .num_res = ARRAY_SIZE(du_resources), - .data = &du_resources, - .size_data = sizeof(du_resources), + .data = &lager_du_pdata, + .size_data = sizeof(lager_du_pdata), .dma_mask = DMA_BIT_MASK(32), };

@@ -202,6 +225,7 @@ static void __init lager_add_standard_devices(void) r8a7790_pinmux_init();

r8a7790_add_standard_devices(); + platform_device_register_data(&platform_bus, "leds-gpio", -1, &lager_leds_pdata, sizeof(lager_leds_pdata)); @@ -220,6 +244,12 @@ static void __init lager_add_standard_devices(void) &ether_pdata, sizeof(ether_pdata));

lager_add_du_device(); + + platform_device_register_simple("adv7123", -1, NULL, 0); + platform_device_register_simple("con-vga", -1, NULL, 0); + platform_device_register_data(&platform_bus, "panel-dpi", -1, + &lager_panel_data, + sizeof(lager_panel_data)); }

static const char * const lager_boards_compat_dt[] __initconst = {

Signed-off-by: Laurent Pinchart laurent.pinchart+renesas@ideasonboard.com --- drivers/gpu/drm/rcar-du/Kconfig | 3 +- drivers/gpu/drm/rcar-du/Makefile | 7 +- drivers/gpu/drm/rcar-du/rcar_du_connector.c | 164 ++++++++++++++++ drivers/gpu/drm/rcar-du/rcar_du_connector.h | 36 ++++ drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 2 +- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 279 ++++++++++++++++++++++++---- drivers/gpu/drm/rcar-du/rcar_du_drv.h | 28 ++- drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 87 ++++----- drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 22 +-- drivers/gpu/drm/rcar-du/rcar_du_kms.c | 116 ++++++++++-- drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 131 ------------- drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h | 25 --- drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 96 ---------- drivers/gpu/drm/rcar-du/rcar_du_vgacon.h | 23 --- include/linux/platform_data/rcar-du.h | 55 +----- 15 files changed, 611 insertions(+), 463 deletions(-) create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_connector.c create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_connector.h delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vgacon.c delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vgacon.h

diff --git a/drivers/gpu/drm/rcar-du/Kconfig b/drivers/gpu/drm/rcar-du/Kconfig index c590cd9..a54eeba 100644 --- a/drivers/gpu/drm/rcar-du/Kconfig +++ b/drivers/gpu/drm/rcar-du/Kconfig @@ -1,9 +1,10 @@ config DRM_RCAR_DU tristate "DRM Support for R-Car Display Unit" - depends on DRM && ARM + depends on DRM && ARM && OF select DRM_KMS_HELPER select DRM_KMS_CMA_HELPER select DRM_GEM_CMA_HELPER + select VIDEOMODE_HELPERS help Choose this option if you have an R-Car chipset. If M is selected the module will be called rcar-du-drm. diff --git a/drivers/gpu/drm/rcar-du/Makefile b/drivers/gpu/drm/rcar-du/Makefile index 12b8d44..3ac8566 100644 --- a/drivers/gpu/drm/rcar-du/Makefile +++ b/drivers/gpu/drm/rcar-du/Makefile @@ -1,11 +1,10 @@ -rcar-du-drm-y := rcar_du_crtc.o \ +rcar-du-drm-y := rcar_du_connector.o \ + rcar_du_crtc.o \ rcar_du_drv.o \ rcar_du_encoder.o \ rcar_du_group.o \ rcar_du_kms.o \ - rcar_du_lvdscon.o \ - rcar_du_plane.o \ - rcar_du_vgacon.o + rcar_du_plane.o

rcar-du-drm-$(CONFIG_DRM_RCAR_LVDS) += rcar_du_lvdsenc.o

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_connector.c b/drivers/gpu/drm/rcar-du/rcar_du_connector.c new file mode 100644 index 0000000..a09aada --- /dev/null +++ b/drivers/gpu/drm/rcar-du/rcar_du_connector.c @@ -0,0 +1,164 @@ +/* + * rcar_du_connector.c -- R-Car Display Unit Connector + * + * Copyright (C) 2013 Renesas Corporation + * + * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#include <linux/export.h> +#include <video/videomode.h> + +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> + +#include "rcar_du_drv.h" +#include "rcar_du_connector.h" +#include "rcar_du_encoder.h" +#include "rcar_du_kms.h" + +static int rcar_du_connector_get_modes(struct drm_connector *connector) +{ + struct rcar_du_connector *rcon = to_rcar_connector(connector); + struct display_entity *entity = to_display_entity(rcon->pad->entity); + const struct videomode *modes; + int ret; + int i; + + ret = display_entity_get_modes(entity, rcon->pad->index, &modes); + if (ret <= 0) + return drm_add_modes_noedid(connector, 1280, 768); + + for (i = 0; i < ret; ++i) { + struct drm_display_mode *mode; + + mode = drm_mode_create(connector->dev); + if (mode == NULL) + break; + + mode->type = DRM_MODE_TYPE_PREFERRED | DRM_MODE_TYPE_DRIVER; + drm_display_mode_from_videomode(&modes[i], mode); + drm_mode_probed_add(connector, mode); + } + + return i; +} + +static int rcar_du_connector_mode_valid(struct drm_connector *connector, + struct drm_display_mode *mode) +{ + return MODE_OK; +} + +static struct drm_encoder * +rcar_du_connector_best_encoder(struct drm_connector *connector) +{ + struct rcar_du_connector *rcon = to_rcar_connector(connector); + + return &rcon->encoder->encoder; +} + +static const struct drm_connector_helper_funcs connector_helper_funcs = { + .get_modes = rcar_du_connector_get_modes, + .mode_valid = rcar_du_connector_mode_valid, + .best_encoder = rcar_du_connector_best_encoder, +}; + +static void rcar_du_connector_destroy(struct drm_connector *connector) +{ + drm_sysfs_connector_remove(connector); + drm_connector_cleanup(connector); +} + +static enum drm_connector_status +rcar_du_connector_detect(struct drm_connector *connector, bool force) +{ + return connector_status_connected; +} + +static const struct drm_connector_funcs connector_funcs = { + .dpms = drm_helper_connector_dpms, + .detect = rcar_du_connector_detect, + .fill_modes = drm_helper_probe_single_connector_modes, + .destroy = rcar_du_connector_destroy, +}; + +struct rcar_du_connector * +rcar_du_connector_create(struct rcar_du_device *rcdu, + struct rcar_du_encoder *renc, struct media_pad *pad) +{ + struct display_entity *entity = to_display_entity(pad->entity); + struct display_entity_interface_params params; + struct rcar_du_connector *rcon; + struct drm_connector *connector; + int connector_type; + unsigned int width; + unsigned int height; + int ret; + + rcon = devm_kzalloc(rcdu->dev, sizeof(*rcon), GFP_KERNEL); + if (rcon == NULL) + return ERR_PTR(-ENOMEM); + + rcon->encoder = renc; + rcon->pad = pad; + + connector = &rcon->connector; + + ret = display_entity_get_size(entity, &width, &height); + if (ret < 0) { + connector->display_info.width_mm = 0; + connector->display_info.height_mm = 0; + } else { + connector->display_info.width_mm = width; + connector->display_info.height_mm = height; + } + + ret = display_entity_get_params(entity, pad->index, &params); + if (ret < 0) { + dev_dbg(rcdu->dev, + "failed to retrieve connector %s parameters\n", + entity->name); + return ERR_PTR(ret); + } + + switch (params.type) { + case DISPLAY_ENTITY_INTERFACE_VGA: + connector_type = DRM_MODE_CONNECTOR_VGA; + break; + case DISPLAY_ENTITY_INTERFACE_LVDS: + connector_type = DRM_MODE_CONNECTOR_LVDS; + break; + default: + connector_type = DRM_MODE_CONNECTOR_Unknown; + break; + } + + ret = drm_connector_init(rcdu->ddev, connector, &connector_funcs, + connector_type); + if (ret < 0) + return ERR_PTR(ret); + + drm_connector_helper_add(connector, &connector_helper_funcs); + ret = drm_sysfs_connector_add(connector); + if (ret < 0) + return ERR_PTR(ret); + + drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF); + drm_object_property_set_value(&connector->base, + rcdu->ddev->mode_config.dpms_property, DRM_MODE_DPMS_OFF); + + ret = drm_mode_connector_attach_encoder(connector, &renc->encoder); + if (ret < 0) + return ERR_PTR(ret); + + connector->encoder = &renc->encoder; + + return rcon; +} diff --git a/drivers/gpu/drm/rcar-du/rcar_du_connector.h b/drivers/gpu/drm/rcar-du/rcar_du_connector.h new file mode 100644 index 0000000..b9a0833 --- /dev/null +++ b/drivers/gpu/drm/rcar-du/rcar_du_connector.h @@ -0,0 +1,36 @@ +/* + * rcar_du_connector.h -- R-Car Display Unit Connector + * + * Copyright (C) 2013 Renesas Corporation + * + * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#ifndef __RCAR_DU_CONNECTOR_H__ +#define __RCAR_DU_CONNECTOR_H__ + +#include <drm/drm_crtc.h> + +struct media_pad; +struct rcar_du_device; +struct rcar_du_encoder; + +struct rcar_du_connector { + struct drm_connector connector; + struct rcar_du_encoder *encoder; + struct media_pad *pad; +}; + +#define to_rcar_connector(c) \ + container_of(c, struct rcar_du_connector, connector) + +struct rcar_du_connector * +rcar_du_connector_create(struct rcar_du_device *rcdu, + struct rcar_du_encoder *renc, struct media_pad *pad); + +#endif /* __RCAR_DU_CONNECTOR_H__ */ diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.h b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h index 43e7575..4e8bfff 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.h +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h @@ -15,11 +15,11 @@ #define __RCAR_DU_CRTC_H__

#include <linux/mutex.h> -#include <linux/platform_data/rcar-du.h>

#include <drm/drmP.h> #include <drm/drm_crtc.h>

+enum rcar_du_output; struct rcar_du_group; struct rcar_du_plane;

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index 0a9f1bb..eda9ca9 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c @@ -15,6 +15,8 @@ #include <linux/io.h> #include <linux/mm.h> #include <linux/module.h> +#include <linux/of_device.h> +#include <linux/platform_data/rcar-du.h> #include <linux/platform_device.h> #include <linux/pm.h> #include <linux/slab.h> @@ -30,6 +32,153 @@ #include "rcar_du_regs.h"

/* ----------------------------------------------------------------------------- + * Display Entities + */ + +static int rcdu_entity_set_stream(struct display_entity *ent, unsigned int port, + enum display_entity_stream_state state) +{ + return 0; +} + +static const struct display_entity_video_ops rcdu_entity_video_ops = { + .set_stream = rcdu_entity_set_stream, +}; + +static const struct display_entity_ops rcdu_entity_ops = { + .video = &rcdu_entity_video_ops, +}; + +static struct media_pad *rcar_du_find_remote_pad(struct rcar_du_device *rcdu, + unsigned int local_pad) +{ + struct display_entity *entity; + unsigned int i; + + list_for_each_entry(entity, &rcdu->notifier.done, list) { + const struct display_entity_graph_data *graph = + entity->match->data; + const struct display_entity_source_data *source = + graph->sources; + + for (i = 0; i < entity->entity.num_pads; ++i) { + struct media_pad *pad = &entity->entity.pads[i]; + + if (pad->flags & MEDIA_PAD_FL_SOURCE) + continue; + + if (!strcmp(source->name, "rcar-du") && + source->port == local_pad) + return pad; + } + } + + return NULL; +} + +static int rcar_du_create_local_links(struct rcar_du_device *rcdu) +{ + u32 link_flags = MEDIA_LNK_FL_IMMUTABLE | MEDIA_LNK_FL_ENABLED; + unsigned int i; + + for (i = 0; i < rcdu->entity.entity.num_pads; ++i) { + struct media_pad *pad; + int ret; + + pad = rcar_du_find_remote_pad(rcdu, i); + if (pad == NULL) + continue; + + ret = media_entity_create_link(&rcdu->entity.entity, i, + pad->entity, pad->index, + link_flags); + if (ret < 0) { + dev_err(rcdu->dev, + "failed to create %s:%u -> %s:%u link\n", + rcdu->entity.entity.name, i, + pad->entity->name, pad->index); + return ret; + } + } + + return 0; +}; + +static int rcar_du_graph_init(struct rcar_du_device *rcdu) +{ + struct display_entity *entity; + unsigned int num_pads; + unsigned int i; + int ret; + + /* Count the number of output pads and initialize the DU entity. */ + for (i = 0, num_pads = 0; rcdu->info->routes[i].output; ++i) + num_pads++; + + rcdu->entity.dev = rcdu->dev; + rcdu->entity.ops = &rcdu_entity_ops; + strcpy(rcdu->entity.name, "R-Car DU"); + + ret = display_entity_init(&rcdu->entity, 0, num_pads); + if (ret < 0) + return ret; + + /* Create links between all entities. In the non-DT case, this is a two + * steps process, we first create links between all external entities, + * and then between the DU entity and the external entities. + */ + if (rcdu->dev->of_node) { + ret = display_of_entity_link_graph(rcdu->dev, + &rcdu->notifier.done, + &rcdu->entity); + } else { + ret = display_entity_link_graph(rcdu->dev, + &rcdu->notifier.done); + if (!ret) + ret = rcar_du_create_local_links(rcdu); + } + + if (ret < 0) { + dev_err(rcdu->dev, "unable to link graph\n"); + return ret; + } + + /* Register the media device and all entities. */ + rcdu->mdev.dev = rcdu->dev; + strlcpy(rcdu->mdev.model, dev_name(rcdu->dev), + sizeof(rcdu->mdev.model)); + + ret = media_device_register(&rcdu->mdev); + if (ret < 0) + return ret; + + list_for_each_entry(entity, &rcdu->notifier.done, list) { + ret = display_entity_register(&rcdu->mdev, entity); + if (ret < 0) + return ret; + } + + ret = display_entity_register(&rcdu->mdev, &rcdu->entity); + if (ret < 0) + return ret; + + return 0; +} + +static void rcar_du_graph_cleanup(struct rcar_du_device *rcdu) +{ + struct display_entity *entity; + + list_for_each_entry(entity, &rcdu->notifier.done, list) + display_entity_unregister(entity); + + display_entity_unregister(&rcdu->entity); + display_entity_cleanup(&rcdu->entity); + + media_device_unregister(&rcdu->mdev); +} + +/* ----------------------------------------------------------------------------- * DRM operations */

@@ -44,6 +193,8 @@ static int rcar_du_unload(struct drm_device *dev) drm_mode_config_cleanup(dev); drm_vblank_cleanup(dev);

+ rcar_du_graph_cleanup(rcdu); + dev->irq_enabled = 0; dev->dev_private = NULL;

@@ -53,25 +204,10 @@ static int rcar_du_unload(struct drm_device *dev) static int rcar_du_load(struct drm_device *dev, unsigned long flags) { struct platform_device *pdev = dev->platformdev; - struct rcar_du_platform_data *pdata = pdev->dev.platform_data; - struct rcar_du_device *rcdu; + struct rcar_du_device *rcdu = platform_get_drvdata(pdev); struct resource *mem; int ret;

- if (pdata == NULL) { - dev_err(dev->dev, "no platform data\n"); - return -ENODEV; - } - - rcdu = devm_kzalloc(&pdev->dev, sizeof(*rcdu), GFP_KERNEL); - if (rcdu == NULL) { - dev_err(dev->dev, "failed to allocate private data\n"); - return -ENOMEM; - } - - rcdu->dev = &pdev->dev; - rcdu->pdata = pdata; - rcdu->info = (struct rcar_du_device_info *)pdev->id_entry->driver_data; rcdu->ddev = dev; dev->dev_private = rcdu;

@@ -81,6 +217,13 @@ static int rcar_du_load(struct drm_device *dev, unsigned long flags) if (IS_ERR(rcdu->mmio)) return PTR_ERR(rcdu->mmio);

+ /* Display Entities */ + ret = rcar_du_graph_init(rcdu); + if (ret < 0) { + dev_err(&pdev->dev, "failed to initialize display entities\n"); + goto done; + } + /* DRM/KMS objects */ ret = rcar_du_modeset_init(rcdu); if (ret < 0) { @@ -97,8 +240,6 @@ static int rcar_du_load(struct drm_device *dev, unsigned long flags)

dev->irq_enabled = 1;

- platform_set_drvdata(pdev, rcdu); - done: if (ret) rcar_du_unload(dev); @@ -218,33 +359,23 @@ static const struct dev_pm_ops rcar_du_pm_ops = { * Platform driver */

-static int rcar_du_probe(struct platform_device *pdev) -{ - return drm_platform_init(&rcar_du_driver, pdev); -} - -static int rcar_du_remove(struct platform_device *pdev) -{ - drm_platform_exit(&rcar_du_driver, pdev); - - return 0; -} - static const struct rcar_du_device_info rcar_du_r8a7779_info = { .features = 0, .num_crtcs = 2, - .routes = { + .routes = (const struct rcar_du_output_routing[]) { /* R8A7779 has two RGB outputs and one (currently unsupported) * TCON output. */ - [RCAR_DU_OUTPUT_DPAD0] = { + { + .output = RCAR_DU_OUTPUT_DPAD0, .possible_crtcs = BIT(0), .encoder_type = DRM_MODE_ENCODER_NONE, - }, - [RCAR_DU_OUTPUT_DPAD1] = { + }, { + .output = RCAR_DU_OUTPUT_DPAD1, .possible_crtcs = BIT(1) | BIT(0), .encoder_type = DRM_MODE_ENCODER_NONE, }, + { }, }, .num_lvds = 0, }; @@ -253,22 +384,24 @@ static const struct rcar_du_device_info rcar_du_r8a7790_info = { .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK | RCAR_DU_FEATURE_ALIGN_128B | RCAR_DU_FEATURE_DEFR8, .num_crtcs = 3, - .routes = { + .routes = (const struct rcar_du_output_routing[]) { /* R8A7790 has one RGB output, two LVDS outputs and one * (currently unsupported) TCON output. */ - [RCAR_DU_OUTPUT_DPAD0] = { + { + .output = RCAR_DU_OUTPUT_DPAD0, .possible_crtcs = BIT(2) | BIT(1) | BIT(0), .encoder_type = DRM_MODE_ENCODER_NONE, - }, - [RCAR_DU_OUTPUT_LVDS0] = { + }, { + .output = RCAR_DU_OUTPUT_LVDS0, .possible_crtcs = BIT(0), .encoder_type = DRM_MODE_ENCODER_LVDS, - }, - [RCAR_DU_OUTPUT_LVDS1] = { + }, { + .output = RCAR_DU_OUTPUT_LVDS1, .possible_crtcs = BIT(2) | BIT(1), .encoder_type = DRM_MODE_ENCODER_LVDS, }, + { }, }, .num_lvds = 2, }; @@ -278,9 +411,72 @@ static const struct platform_device_id rcar_du_id_table[] = { { "rcar-du-r8a7790", (kernel_ulong_t)&rcar_du_r8a7790_info }, { } }; - MODULE_DEVICE_TABLE(platform, rcar_du_id_table);

+static const struct of_device_id rcar_du_of_table[] = { + { .compatible = "renesas,du-r8a7779", .data = &rcar_du_r8a7779_info }, + { .compatible = "renesas,du-r8a7790", .data = &rcar_du_r8a7790_info }, + { } +}; +MODULE_DEVICE_TABLE(of, rcar_du_of_table); + +static int rcar_du_notifier_complete(struct display_entity_notifier *notifier) +{ + struct platform_device *pdev = to_platform_device(notifier->dev); + + return drm_platform_init(&rcar_du_driver, pdev); +} + +static int rcar_du_probe(struct platform_device *pdev) +{ + struct rcar_du_platform_data *pdata = pdev->dev.platform_data; + struct device_node *np = pdev->dev.of_node; + struct rcar_du_device *rcdu; + int ret; + + rcdu = devm_kzalloc(&pdev->dev, sizeof(*rcdu), GFP_KERNEL); + if (rcdu == NULL) + return -ENOMEM; + + rcdu->dev = &pdev->dev; + + if (np) + rcdu->info = of_match_device(rcar_du_of_table, rcdu->dev)->data; + else + rcdu->info = (void *)platform_get_device_id(pdev)->driver_data; + + platform_set_drvdata(pdev, rcdu); + + rcdu->notifier.dev = rcdu->dev; + rcdu->notifier.complete = rcar_du_notifier_complete; + + if (np) { + ret = display_of_entity_build_notifier(&rcdu->notifier, np); + } else if (pdata) { + ret = display_entity_build_notifier(&rcdu->notifier, + pdata->graph); + } else { + dev_err(&pdev->dev, "no platform data"); + ret = -ENXIO; + } + + if (ret < 0) + return ret; + + return display_entity_register_notifier(&rcdu->notifier); +} + +static int rcar_du_remove(struct platform_device *pdev) +{ + struct rcar_du_device *rcdu = platform_get_drvdata(pdev); + + display_entity_unregister_notifier(&rcdu->notifier); + + drm_platform_exit(&rcar_du_driver, pdev); + + return 0; +} + static struct platform_driver rcar_du_platform_driver = { .probe = rcar_du_probe, .remove = rcar_du_remove, @@ -288,6 +484,7 @@ static struct platform_driver rcar_du_platform_driver = { .owner = THIS_MODULE, .name = "rcar-du", .pm = &rcar_du_pm_ops, + .of_match_table = of_match_ptr(rcar_du_of_table), }, .id_table = rcar_du_id_table, }; diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.h b/drivers/gpu/drm/rcar-du/rcar_du_drv.h index 65d2d63..49338e1 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h @@ -15,7 +15,8 @@ #define __RCAR_DU_DRV_H__

#include <linux/kernel.h> -#include <linux/platform_data/rcar-du.h> +#include <media/media-device.h> +#include <video/display.h>

#include "rcar_du_crtc.h" #include "rcar_du_group.h" @@ -31,16 +32,28 @@ struct rcar_du_lvdsenc; #define RCAR_DU_FEATURE_ALIGN_128B (1 << 1) /* Align pitches to 128 bytes */ #define RCAR_DU_FEATURE_DEFR8 (1 << 2) /* Has DEFR8 register */

+enum rcar_du_output { + RCAR_DU_OUTPUT_NONE, + RCAR_DU_OUTPUT_DPAD0, + RCAR_DU_OUTPUT_DPAD1, + RCAR_DU_OUTPUT_LVDS0, + RCAR_DU_OUTPUT_LVDS1, + RCAR_DU_OUTPUT_TCON, + RCAR_DU_OUTPUT_MAX, +}; + /* * struct rcar_du_output_routing - Output routing specification + * @output: DU output * @possible_crtcs: bitmask of possible CRTCs for the output * @encoder_type: DRM type of the internal encoder associated with the output * * The DU has 5 possible outputs (DPAD0/1, LVDS0/1, TCON). Output routing data - * specify the valid SoC outputs, which CRTCs can drive the output, and the type - * of in-SoC encoder for the output. + * specify an SoC output, which CRTCs can drive it, and the type of in-SoC + * encoder for the output. */ struct rcar_du_output_routing { + enum rcar_du_output output; unsigned int possible_crtcs; unsigned int encoder_type; }; @@ -49,23 +62,26 @@ struct rcar_du_output_routing { * struct rcar_du_device_info - DU model-specific information * @features: device features (RCAR_DU_FEATURE_*) * @num_crtcs: total number of CRTCs - * @routes: array of CRTC to output routes, indexed by output (RCAR_DU_OUTPUT_*) + * @routes: array of CRTC to output routes, indexed by port number * @num_lvds: number of internal LVDS encoders */ struct rcar_du_device_info { unsigned int features; unsigned int num_crtcs; - struct rcar_du_output_routing routes[RCAR_DU_OUTPUT_MAX]; + const struct rcar_du_output_routing *routes; unsigned int num_lvds; };

struct rcar_du_device { struct device *dev; - const struct rcar_du_platform_data *pdata; const struct rcar_du_device_info *info;

void __iomem *mmio;

+ struct media_device mdev; + struct display_entity entity; + struct display_entity_notifier notifier; + struct drm_device *ddev; struct drm_fbdev_cma *fbdev;

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c index 3daa7a1..9991fb0 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c @@ -20,25 +20,7 @@ #include "rcar_du_drv.h" #include "rcar_du_encoder.h" #include "rcar_du_kms.h" -#include "rcar_du_lvdscon.h" #include "rcar_du_lvdsenc.h" -#include "rcar_du_vgacon.h" - -/* ----------------------------------------------------------------------------- - * Common connector functions - */ - -struct drm_encoder * -rcar_du_connector_best_encoder(struct drm_connector *connector) -{ - struct rcar_du_connector *rcon = to_rcar_connector(connector); - - return &rcon->encoder->encoder; -} - -/* ----------------------------------------------------------------------------- - * Encoder - */

static void rcar_du_encoder_dpms(struct drm_encoder *encoder, int mode) { @@ -139,10 +121,9 @@ static const struct drm_encoder_funcs encoder_funcs = { .destroy = drm_encoder_cleanup, };

-int rcar_du_encoder_init(struct rcar_du_device *rcdu, - enum rcar_du_encoder_type type, - enum rcar_du_output output, - const struct rcar_du_encoder_data *data) +struct rcar_du_encoder * +rcar_du_encoder_create(struct rcar_du_device *rcdu, unsigned int port, + struct media_pad *pad) { struct rcar_du_encoder *renc; unsigned int encoder_type; @@ -150,11 +131,13 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu,

renc = devm_kzalloc(rcdu->dev, sizeof(*renc), GFP_KERNEL); if (renc == NULL) - return -ENOMEM; + return ERR_PTR(-ENOMEM);

- renc->output = output; + renc->port = port; + renc->output = rcdu->info->routes[port].output;

- switch (output) { + /* Do we have an internal LVDS encoder? */ + switch (renc->output) { case RCAR_DU_OUTPUT_LVDS0: renc->lvds = rcdu->lvds[0]; break; @@ -167,36 +150,44 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu, break; }

- switch (type) { - case RCAR_DU_ENCODER_VGA: - encoder_type = DRM_MODE_ENCODER_DAC; - break; - case RCAR_DU_ENCODER_LVDS: - encoder_type = DRM_MODE_ENCODER_LVDS; - break; - case RCAR_DU_ENCODER_NONE: - default: + /* Find the encoder type. */ + if (pad) { + struct display_entity *entity = to_display_entity(pad->entity); + struct display_entity_interface_params params; + + ret = display_entity_get_params(entity, pad->index, &params); + if (ret < 0) { + dev_dbg(rcdu->dev, + "failed to retrieve encoder %s parameters\n", + entity->name); + return ERR_PTR(ret); + } + + switch (params.type) { + case DISPLAY_ENTITY_INTERFACE_DPI: + case DISPLAY_ENTITY_INTERFACE_DBI: + default: + encoder_type = DRM_MODE_ENCODER_NONE; + break; + case DISPLAY_ENTITY_INTERFACE_LVDS: + encoder_type = DRM_MODE_ENCODER_DAC; + break; + case DISPLAY_ENTITY_INTERFACE_VGA: + encoder_type = DRM_MODE_ENCODER_DAC; + break; + } + } else { /* No external encoder, use the internal encoder type. */ - encoder_type = rcdu->info->routes[output].encoder_type; - break; + encoder_type = rcdu->info->routes[port].encoder_type; }

+ /* Initialize the encoder. */ ret = drm_encoder_init(rcdu->ddev, &renc->encoder, &encoder_funcs, encoder_type); if (ret < 0) - return ret; + return ERR_PTR(ret);

drm_encoder_helper_add(&renc->encoder, &encoder_helper_funcs);

- switch (encoder_type) { - case DRM_MODE_ENCODER_LVDS: - return rcar_du_lvds_connector_init(rcdu, renc, - &data->connector.lvds.panel); - - case DRM_MODE_ENCODER_DAC: - return rcar_du_vga_connector_init(rcdu, renc); - - default: - return -EINVAL; - } + return renc; } diff --git a/drivers/gpu/drm/rcar-du/rcar_du_encoder.h b/drivers/gpu/drm/rcar-du/rcar_du_encoder.h index 0e5a65e..7a19d5b 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_encoder.h +++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.h @@ -14,15 +14,15 @@ #ifndef __RCAR_DU_ENCODER_H__ #define __RCAR_DU_ENCODER_H__

-#include <linux/platform_data/rcar-du.h> - #include <drm/drm_crtc.h>

+struct media_pad; struct rcar_du_device; struct rcar_du_lvdsenc;

struct rcar_du_encoder { struct drm_encoder encoder; + unsigned int port; enum rcar_du_output output; struct rcar_du_lvdsenc *lvds; }; @@ -30,20 +30,8 @@ struct rcar_du_encoder { #define to_rcar_encoder(e) \ container_of(e, struct rcar_du_encoder, encoder)

-struct rcar_du_connector { - struct drm_connector connector; - struct rcar_du_encoder *encoder; -}; - -#define to_rcar_connector(c) \ - container_of(c, struct rcar_du_connector, connector) - -struct drm_encoder * -rcar_du_connector_best_encoder(struct drm_connector *connector); - -int rcar_du_encoder_init(struct rcar_du_device *rcdu, - enum rcar_du_encoder_type type, - enum rcar_du_output output, - const struct rcar_du_encoder_data *data); +struct rcar_du_encoder * +rcar_du_encoder_create(struct rcar_du_device *rcdu, unsigned int port, + struct media_pad *pad);

#endif /* __RCAR_DU_ENCODER_H__ */ diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c index b31ac08..2dc9e80 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c @@ -17,6 +17,7 @@ #include <drm/drm_fb_cma_helper.h> #include <drm/drm_gem_cma_helper.h>

+#include "rcar_du_connector.h" #include "rcar_du_crtc.h" #include "rcar_du_drv.h" #include "rcar_du_encoder.h" @@ -179,6 +180,89 @@ static const struct drm_mode_config_funcs rcar_du_mode_config_funcs = { .output_poll_changed = rcar_du_output_poll_changed, };

+/* ----------------------------------------------------------------------------- + * Pipeline and Mode Setting Initialization + */ + +static int rcar_du_pipe_init(struct rcar_du_device *rcdu, unsigned int port, + struct media_pad *remote) +{ + struct media_pad *pad_encoder = NULL; + struct media_pad *pad_connector = remote; + struct rcar_du_encoder *renc; + struct rcar_du_connector *rcon; + struct media_entity *entity; + + /* We need to expose one KMS encoder and one KMS connector for an + * arbitrarily long chain of external entities. Walk the chain and map + * the last entity to the connector, and the next-to-last entity to the + * encoder. + */ + + /* Start at the entity connected to the DU output. */ + entity = remote->entity; + + dev_dbg(rcdu->dev, "%s: starting at entity %s pad %u\n", __func__, + entity->name, remote->index); + + while (1) { + struct media_link *next = NULL; + unsigned int i; + + /* Search the entity for an output link. As we only support + * linear pipelines, return an error if multiple output links + * are found. + */ + dev_dbg(rcdu->dev, + "%s: searching for an output link on entity %s\n", + __func__, entity->name); + + for (i = 0; i < entity->num_links; ++i) { + struct media_link *link = &entity->links[i]; + + if (link->source->entity != entity) + continue; + + if (next) + return -EPIPE; + + next = link; + } + + if (next == NULL) { + dev_dbg(rcdu->dev, "%s: not output link found\n", + __func__); + break; + } + + dev_dbg(rcdu->dev, + "%s: output link %s:%u -> %s:%u found\n", __func__, + next->source->entity->name, next->source->index, + next->sink->entity->name, next->sink->index); + + pad_encoder = next->source; + pad_connector = next->sink; + entity = pad_connector->entity; + } + + dev_dbg(rcdu->dev, + "%s: encoder pad %s/%u connector pad %s/%u\n", __func__, + pad_encoder ? pad_encoder->entity->name : NULL, + pad_encoder ? pad_encoder->index : 0, + pad_connector->entity->name, pad_connector->index); + + /* Create the encoder and connector. */ + renc = rcar_du_encoder_create(rcdu, port, pad_encoder); + if (IS_ERR(renc)) + return PTR_ERR(renc); + + rcon = rcar_du_connector_create(rcdu, renc, pad_connector); + if (IS_ERR(rcon)) + return PTR_ERR(rcon); + + return 0; +} + int rcar_du_modeset_init(struct rcar_du_device *rcdu) { static const unsigned int mmio_offsets[] = { @@ -188,6 +272,7 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu) struct drm_device *dev = rcdu->ddev; struct drm_encoder *encoder; struct drm_fbdev_cma *fbdev; + unsigned int num_encoders = 0; unsigned int num_groups; unsigned int i; int ret; @@ -226,29 +311,26 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu) return ret; }

- /* Initialize the encoders. */ + /* Initialize the internal encoders. */ ret = rcar_du_lvdsenc_init(rcdu); if (ret < 0) return ret;

- for (i = 0; i < rcdu->pdata->num_encoders; ++i) { - const struct rcar_du_encoder_data *pdata = - &rcdu->pdata->encoders[i]; - const struct rcar_du_output_routing *route = - &rcdu->info->routes[pdata->output]; + /* Create an encoder and a connector for each output connected to + * external entities. + */ + for (i = 0; i < rcdu->entity.entity.num_pads; ++i) { + struct media_pad *pad;

- if (pdata->type == RCAR_DU_ENCODER_UNUSED) + pad = media_entity_remote_pad(&rcdu->entity.entity.pads[i]); + if (pad == NULL) continue;

- if (pdata->output >= RCAR_DU_OUTPUT_MAX || - route->possible_crtcs == 0) { - dev_warn(rcdu->dev, - "encoder %u references unexisting output %u, skipping\n", - i, pdata->output); - continue; - } + ret = rcar_du_pipe_init(rcdu, i, pad); + if (ret < 0) + return ret;

- rcar_du_encoder_init(rcdu, pdata->type, pdata->output, pdata); + num_encoders++; }

/* Set the possible CRTCs and possible clones. There's always at least @@ -258,10 +340,10 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu) list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { struct rcar_du_encoder *renc = to_rcar_encoder(encoder); const struct rcar_du_output_routing *route = - &rcdu->info->routes[renc->output]; + &rcdu->info->routes[renc->port];

encoder->possible_crtcs = route->possible_crtcs; - encoder->possible_clones = (1 << rcdu->pdata->num_encoders) - 1; + encoder->possible_clones = (1 << num_encoders) - 1; }

/* Now that the CRTCs have been initialized register the planes. */ diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c deleted file mode 100644 index 4f3ba93..0000000 --- a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c +++ /dev/null @@ -1,131 +0,0 @@ -/* - * rcar_du_lvdscon.c -- R-Car Display Unit LVDS Connector - * - * Copyright (C) 2013 Renesas Corporation - * - * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - -#include <drm/drmP.h> -#include <drm/drm_crtc.h> -#include <drm/drm_crtc_helper.h> - -#include "rcar_du_drv.h" -#include "rcar_du_encoder.h" -#include "rcar_du_kms.h" -#include "rcar_du_lvdscon.h" - -struct rcar_du_lvds_connector { - struct rcar_du_connector connector; - - const struct rcar_du_panel_data *panel; -}; - -#define to_rcar_lvds_connector(c) \ - container_of(c, struct rcar_du_lvds_connector, connector.connector) - -static int rcar_du_lvds_connector_get_modes(struct drm_connector *connector) -{ - struct rcar_du_lvds_connector *lvdscon = - to_rcar_lvds_connector(connector); - struct drm_display_mode *mode; - - mode = drm_mode_create(connector->dev); - if (mode == NULL) - return 0; - - mode->type = DRM_MODE_TYPE_PREFERRED | DRM_MODE_TYPE_DRIVER; - mode->clock = lvdscon->panel->mode.clock; - mode->hdisplay = lvdscon->panel->mode.hdisplay; - mode->hsync_start = lvdscon->panel->mode.hsync_start; - mode->hsync_end = lvdscon->panel->mode.hsync_end; - mode->htotal = lvdscon->panel->mode.htotal; - mode->vdisplay = lvdscon->panel->mode.vdisplay; - mode->vsync_start = lvdscon->panel->mode.vsync_start; - mode->vsync_end = lvdscon->panel->mode.vsync_end; - mode->vtotal = lvdscon->panel->mode.vtotal; - mode->flags = lvdscon->panel->mode.flags; - - drm_mode_set_name(mode); - drm_mode_probed_add(connector, mode); - - return 1; -} - -static int rcar_du_lvds_connector_mode_valid(struct drm_connector *connector, - struct drm_display_mode *mode) -{ - return MODE_OK; -} - -static const struct drm_connector_helper_funcs connector_helper_funcs = { - .get_modes = rcar_du_lvds_connector_get_modes, - .mode_valid = rcar_du_lvds_connector_mode_valid, - .best_encoder = rcar_du_connector_best_encoder, -}; - -static void rcar_du_lvds_connector_destroy(struct drm_connector *connector) -{ - drm_sysfs_connector_remove(connector); - drm_connector_cleanup(connector); -} - -static enum drm_connector_status -rcar_du_lvds_connector_detect(struct drm_connector *connector, bool force) -{ - return connector_status_connected; -} - -static const struct drm_connector_funcs connector_funcs = { - .dpms = drm_helper_connector_dpms, - .detect = rcar_du_lvds_connector_detect, - .fill_modes = drm_helper_probe_single_connector_modes, - .destroy = rcar_du_lvds_connector_destroy, -}; - -int rcar_du_lvds_connector_init(struct rcar_du_device *rcdu, - struct rcar_du_encoder *renc, - const struct rcar_du_panel_data *panel) -{ - struct rcar_du_lvds_connector *lvdscon; - struct drm_connector *connector; - int ret; - - lvdscon = devm_kzalloc(rcdu->dev, sizeof(*lvdscon), GFP_KERNEL); - if (lvdscon == NULL) - return -ENOMEM; - - lvdscon->panel = panel; - - connector = &lvdscon->connector.connector; - connector->display_info.width_mm = panel->width_mm; - connector->display_info.height_mm = panel->height_mm; - - ret = drm_connector_init(rcdu->ddev, connector, &connector_funcs, - DRM_MODE_CONNECTOR_LVDS); - if (ret < 0) - return ret; - - drm_connector_helper_add(connector, &connector_helper_funcs); - ret = drm_sysfs_connector_add(connector); - if (ret < 0) - return ret; - - drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF); - drm_object_property_set_value(&connector->base, - rcdu->ddev->mode_config.dpms_property, DRM_MODE_DPMS_OFF); - - ret = drm_mode_connector_attach_encoder(connector, &renc->encoder); - if (ret < 0) - return ret; - - connector->encoder = &renc->encoder; - lvdscon->connector.encoder = renc; - - return 0; -} diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h deleted file mode 100644 index bff8683..0000000 --- a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * rcar_du_lvdscon.h -- R-Car Display Unit LVDS Connector - * - * Copyright (C) 2013 Renesas Corporation - * - * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - -#ifndef __RCAR_DU_LVDSCON_H__ -#define __RCAR_DU_LVDSCON_H__ - -struct rcar_du_device; -struct rcar_du_encoder; -struct rcar_du_panel_data; - -int rcar_du_lvds_connector_init(struct rcar_du_device *rcdu, - struct rcar_du_encoder *renc, - const struct rcar_du_panel_data *panel); - -#endif /* __RCAR_DU_LVDSCON_H__ */ diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c b/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c deleted file mode 100644 index 72312f7..0000000 --- a/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c +++ /dev/null @@ -1,96 +0,0 @@ -/* - * rcar_du_vgacon.c -- R-Car Display Unit VGA Connector - * - * Copyright (C) 2013 Renesas Corporation - * - * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - -#include <drm/drmP.h> -#include <drm/drm_crtc.h> -#include <drm/drm_crtc_helper.h> - -#include "rcar_du_drv.h" -#include "rcar_du_encoder.h" -#include "rcar_du_kms.h" -#include "rcar_du_vgacon.h" - -static int rcar_du_vga_connector_get_modes(struct drm_connector *connector) -{ - return drm_add_modes_noedid(connector, 1280, 768); -} - -static int rcar_du_vga_connector_mode_valid(struct drm_connector *connector, - struct drm_display_mode *mode) -{ - return MODE_OK; -} - -static const struct drm_connector_helper_funcs connector_helper_funcs = { - .get_modes = rcar_du_vga_connector_get_modes, - .mode_valid = rcar_du_vga_connector_mode_valid, - .best_encoder = rcar_du_connector_best_encoder, -}; - -static void rcar_du_vga_connector_destroy(struct drm_connector *connector) -{ - drm_sysfs_connector_remove(connector); - drm_connector_cleanup(connector); -} - -static enum drm_connector_status -rcar_du_vga_connector_detect(struct drm_connector *connector, bool force) -{ - return connector_status_connected; -} - -static const struct drm_connector_funcs connector_funcs = { - .dpms = drm_helper_connector_dpms, - .detect = rcar_du_vga_connector_detect, - .fill_modes = drm_helper_probe_single_connector_modes, - .destroy = rcar_du_vga_connector_destroy, -}; - -int rcar_du_vga_connector_init(struct rcar_du_device *rcdu, - struct rcar_du_encoder *renc) -{ - struct rcar_du_connector *rcon; - struct drm_connector *connector; - int ret; - - rcon = devm_kzalloc(rcdu->dev, sizeof(*rcon), GFP_KERNEL); - if (rcon == NULL) - return -ENOMEM; - - connector = &rcon->connector; - connector->display_info.width_mm = 0; - connector->display_info.height_mm = 0; - - ret = drm_connector_init(rcdu->ddev, connector, &connector_funcs, - DRM_MODE_CONNECTOR_VGA); - if (ret < 0) - return ret; - - drm_connector_helper_add(connector, &connector_helper_funcs); - ret = drm_sysfs_connector_add(connector); - if (ret < 0) - return ret; - - drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF); - drm_object_property_set_value(&connector->base, - rcdu->ddev->mode_config.dpms_property, DRM_MODE_DPMS_OFF); - - ret = drm_mode_connector_attach_encoder(connector, &renc->encoder); - if (ret < 0) - return ret; - - connector->encoder = &renc->encoder; - rcon->encoder = renc; - - return 0; -} diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vgacon.h b/drivers/gpu/drm/rcar-du/rcar_du_vgacon.h deleted file mode 100644 index b12b0cf..0000000 --- a/drivers/gpu/drm/rcar-du/rcar_du_vgacon.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * rcar_du_vgacon.h -- R-Car Display Unit VGA Connector - * - * Copyright (C) 2013 Renesas Corporation - * - * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - -#ifndef __RCAR_DU_VGACON_H__ -#define __RCAR_DU_VGACON_H__ - -struct rcar_du_device; -struct rcar_du_encoder; - -int rcar_du_vga_connector_init(struct rcar_du_device *rcdu, - struct rcar_du_encoder *renc); - -#endif /* __RCAR_DU_VGACON_H__ */ diff --git a/include/linux/platform_data/rcar-du.h b/include/linux/platform_data/rcar-du.h index 1a2e990..b424b75 100644 --- a/include/linux/platform_data/rcar-du.h +++ b/include/linux/platform_data/rcar-du.h @@ -14,61 +14,10 @@ #ifndef __RCAR_DU_H__ #define __RCAR_DU_H__

-#include <drm/drm_mode.h> - -enum rcar_du_output { - RCAR_DU_OUTPUT_DPAD0, - RCAR_DU_OUTPUT_DPAD1, - RCAR_DU_OUTPUT_LVDS0, - RCAR_DU_OUTPUT_LVDS1, - RCAR_DU_OUTPUT_TCON, - RCAR_DU_OUTPUT_MAX, -}; - -enum rcar_du_encoder_type { - RCAR_DU_ENCODER_UNUSED = 0, - RCAR_DU_ENCODER_NONE, - RCAR_DU_ENCODER_VGA, - RCAR_DU_ENCODER_LVDS, -}; - -struct rcar_du_panel_data { - unsigned int width_mm; /* Panel width in mm */ - unsigned int height_mm; /* Panel height in mm */ - struct drm_mode_modeinfo mode; -}; - -struct rcar_du_connector_lvds_data { - struct rcar_du_panel_data panel; -}; - -struct rcar_du_connector_vga_data { - /* TODO: Add DDC information for EDID retrieval */ -}; - -/* - * struct rcar_du_encoder_data - Encoder platform data - * @type: the encoder type (RCAR_DU_ENCODER_*) - * @output: the DU output the connector is connected to (RCAR_DU_OUTPUT_*) - * @connector.lvds: platform data for LVDS connectors - * @connector.vga: platform data for VGA connectors - * - * Encoder platform data describes an on-board encoder, its associated DU SoC - * output, and the connector. - */ -struct rcar_du_encoder_data { - enum rcar_du_encoder_type type; - enum rcar_du_output output; - - union { - struct rcar_du_connector_lvds_data lvds; - struct rcar_du_connector_vga_data vga; - } connector; -}; +#include <video/display.h>

struct rcar_du_platform_data { - struct rcar_du_encoder_data *encoders; - unsigned int num_encoders; + const struct display_entity_graph_data *graph; };

#endif /* __RCAR_DU_H__ */