From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: dri-devel@lists.freedesktop.org
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Subject: [PATCH v3 30/61] drm/omap: dss: Split omapdss_register_display()
Date: Mon, 6 Aug 2018 03:27:10 +0300 [thread overview]
Message-ID: <20180806002741.30929-31-laurent.pinchart@ideasonboard.com> (raw)
In-Reply-To: <20180806002741.30929-1-laurent.pinchart@ideasonboard.com>
Split the function into omapdss_display_init() to perform
display-specific initialization of the omap_dss_device, and
omapdss_register_display() to register the device. The latter will then
be replaced by more generic registration.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
---
drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c | 1 +
drivers/gpu/drm/omapdrm/displays/connector-dvi.c | 1 +
drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 1 +
drivers/gpu/drm/omapdrm/displays/panel-dpi.c | 1 +
drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 1 +
drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c | 1 +
drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c | 1 +
drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 1 +
drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c | 1 +
drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c | 1 +
drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c | 1 +
drivers/gpu/drm/omapdrm/dss/display.c | 6 +++++-
drivers/gpu/drm/omapdrm/dss/omapdss.h | 1 +
13 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index 7d16c320749f..ae3976a97ce2 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -171,6 +171,7 @@ static int tvc_probe(struct platform_device *pdev)
dssdev->type = OMAP_DISPLAY_TYPE_VENC;
dssdev->owner = THIS_MODULE;
+ omapdss_display_init(dssdev);
r = omapdss_register_display(dssdev);
if (r) {
dev_err(&pdev->dev, "Failed to register panel\n");
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
index 211d59cf8dcd..5e3ef5e9e9f6 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
@@ -390,6 +390,7 @@ static int dvic_probe(struct platform_device *pdev)
dssdev->type = OMAP_DISPLAY_TYPE_DVI;
dssdev->owner = THIS_MODULE;
+ omapdss_display_init(dssdev);
r = omapdss_register_display(dssdev);
if (r) {
dev_err(&pdev->dev, "Failed to register panel\n");
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
index 0998b8715096..cf64742d8646 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
@@ -350,6 +350,7 @@ static int hdmic_probe(struct platform_device *pdev)
dssdev->type = OMAP_DISPLAY_TYPE_HDMI;
dssdev->owner = THIS_MODULE;
+ omapdss_display_init(dssdev);
r = omapdss_register_display(dssdev);
if (r) {
dev_err(&pdev->dev, "Failed to register panel\n");
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
index 5864e24a6e21..c4c529531243 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
@@ -218,6 +218,7 @@ static int panel_dpi_probe(struct platform_device *pdev)
dssdev->type = OMAP_DISPLAY_TYPE_DPI;
dssdev->owner = THIS_MODULE;
+ omapdss_display_init(dssdev);
r = omapdss_register_display(dssdev);
if (r) {
dev_err(&pdev->dev, "Failed to register panel\n");
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
index 365ece2927a4..479ce69fd8d8 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
@@ -1328,6 +1328,7 @@ static int dsicm_probe(struct platform_device *pdev)
dssdev->caps = OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE |
OMAP_DSS_DISPLAY_CAP_TEAR_ELIM;
+ omapdss_display_init(dssdev);
r = omapdss_register_display(dssdev);
if (r) {
dev_err(dev, "Failed to register panel\n");
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
index 2e54ac115dbc..fb0afd5adf48 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
@@ -270,6 +270,7 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi)
dssdev->type = OMAP_DISPLAY_TYPE_DPI;
dssdev->owner = THIS_MODULE;
+ omapdss_display_init(dssdev);
r = omapdss_register_display(dssdev);
if (r) {
dev_err(&spi->dev, "Failed to register panel\n");
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
index 6f2261ccd442..6ae113871032 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
@@ -293,6 +293,7 @@ static int nec_8048_probe(struct spi_device *spi)
dssdev->type = OMAP_DISPLAY_TYPE_DPI;
dssdev->owner = THIS_MODULE;
+ omapdss_display_init(dssdev);
r = omapdss_register_display(dssdev);
if (r) {
dev_err(&spi->dev, "Failed to register panel\n");
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c b/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
index 369501251fa9..fb986b586749 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
@@ -269,6 +269,7 @@ static int sharp_ls_probe(struct platform_device *pdev)
dssdev->type = OMAP_DISPLAY_TYPE_DPI;
dssdev->owner = THIS_MODULE;
+ omapdss_display_init(dssdev);
r = omapdss_register_display(dssdev);
if (r) {
dev_err(&pdev->dev, "Failed to register panel\n");
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c b/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
index 5bfd24c5ad5c..e110187ff911 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
@@ -800,6 +800,7 @@ static int acx565akm_probe(struct spi_device *spi)
dssdev->type = OMAP_DISPLAY_TYPE_SDI;
dssdev->owner = THIS_MODULE;
+ omapdss_display_init(dssdev);
r = omapdss_register_display(dssdev);
if (r) {
dev_err(&spi->dev, "Failed to register panel\n");
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
index 9117c1ba037b..c44e1b430a0e 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
@@ -394,6 +394,7 @@ static int td028ttec1_panel_probe(struct spi_device *spi)
dssdev->type = OMAP_DISPLAY_TYPE_DPI;
dssdev->owner = THIS_MODULE;
+ omapdss_display_init(dssdev);
r = omapdss_register_display(dssdev);
if (r) {
dev_err(&spi->dev, "Failed to register panel\n");
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
index 53742a61aa86..0cb70abb6e5d 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
@@ -537,6 +537,7 @@ static int tpo_td043_probe(struct spi_device *spi)
dssdev->type = OMAP_DISPLAY_TYPE_DPI;
dssdev->owner = THIS_MODULE;
+ omapdss_display_init(dssdev);
r = omapdss_register_display(dssdev);
if (r) {
dev_err(&spi->dev, "Failed to register panel\n");
diff --git a/drivers/gpu/drm/omapdrm/dss/display.c b/drivers/gpu/drm/omapdrm/dss/display.c
index 5df73cd76153..c641993c7d17 100644
--- a/drivers/gpu/drm/omapdrm/dss/display.c
+++ b/drivers/gpu/drm/omapdrm/dss/display.c
@@ -32,7 +32,7 @@ static LIST_HEAD(panel_list);
static DEFINE_MUTEX(panel_list_mutex);
static int disp_num_counter;
-int omapdss_register_display(struct omap_dss_device *dssdev)
+void omapdss_display_init(struct omap_dss_device *dssdev)
{
int id;
@@ -52,7 +52,11 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
if (dssdev->name == NULL)
dssdev->name = devm_kasprintf(dssdev->dev, GFP_KERNEL,
"display%u", id);
+}
+EXPORT_SYMBOL_GPL(omapdss_display_init);
+int omapdss_register_display(struct omap_dss_device *dssdev)
+{
mutex_lock(&panel_list_mutex);
list_add_tail(&dssdev->panel_list, &panel_list);
mutex_unlock(&panel_list_mutex);
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 94a3f98bdd3d..e42821583b91 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -487,6 +487,7 @@ static inline bool omapdss_is_initialized(void)
return !!omapdss_get_dss();
}
+void omapdss_display_init(struct omap_dss_device *dssdev);
int omapdss_register_display(struct omap_dss_device *dssdev);
void omapdss_unregister_display(struct omap_dss_device *dssdev);
#define for_each_dss_display(d) \
--
Regards,
Laurent Pinchart
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2018-08-06 0:27 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-06 0:26 [PATCH v3 00/61] omapdrm: Reverse direction of DSS device (dis)connect operations Laurent Pinchart
2018-08-06 0:26 ` [PATCH v3 01/61] drm/omap: Allocate drm_device earlier and unref it as last step Laurent Pinchart
2018-08-06 0:26 ` [PATCH v3 02/61] drm/omap: Manage the usable omap_dss_device list within omap_drm_private Laurent Pinchart
2018-08-06 0:26 ` [PATCH v3 03/61] drm/omap: Do dss_device (display) ordering in omap_drv.c Laurent Pinchart
2018-08-06 0:26 ` [PATCH v3 04/61] drm/omap: dss: Remove display ordering from dss/display.c Laurent Pinchart
2018-08-06 0:26 ` [PATCH v3 05/61] drm/omap: dss: Gather OMAP DSS components at probe time Laurent Pinchart
2018-08-06 0:26 ` [PATCH v3 06/61] drm/omap: dss: Move platform_device_register from core.c to dss.c probe Laurent Pinchart
2018-08-06 0:26 ` [PATCH v3 07/61] drm/omap: dss: Handle DPI and SDI port initialization failures Laurent Pinchart
2018-08-06 0:26 ` [PATCH v3 08/61] drm/omap: dss: Remove omapdss_atv_ops get_wss and set_wss operations Laurent Pinchart
2018-08-06 0:26 ` [PATCH v3 09/61] drm/omap: dss: Remove DSS encoders get_timings operation Laurent Pinchart
2018-08-06 0:26 ` [PATCH v3 10/61] drm/omap: dss: Remove unused omapdss_default_get_timings() Laurent Pinchart
2018-08-06 0:26 ` [PATCH v3 11/61] drm/omap: dss: Constify omap_dss_driver operations structure Laurent Pinchart
2018-08-06 0:26 ` [PATCH v3 12/61] drm/omap: displays: Remove videomode from omap_dss_device structure Laurent Pinchart
2018-08-06 0:26 ` [PATCH v3 13/61] drm/omap: dss: Remove omap_dss_device panel fields Laurent Pinchart
2018-08-06 0:26 ` [PATCH v3 14/61] drm/omap: dss: Rename omap_dss_device list field to output_list Laurent Pinchart
2018-08-06 0:26 ` [PATCH v3 15/61] drm/omap: dss: Create global list of all omap_dss_device instances Laurent Pinchart
2018-08-06 0:26 ` [PATCH v3 16/61] drm/omap: dss: Create and use omapdss_device_is_registered() Laurent Pinchart
2018-08-06 0:26 ` [PATCH v3 17/61] drm/omap: dss: Rework output lookup by port node Laurent Pinchart
2018-08-06 0:26 ` [PATCH v3 18/61] drm/omap: dss: Allow looking up any device by port Laurent Pinchart
2018-08-06 0:26 ` [PATCH v3 19/61] drm/omap: dss: Move common device operations to common structure Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 20/61] drm/omap: dss: Add functions to connect and disconnect devices Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 21/61] drm/omap: dss: Move debug message and checks to connection handlers Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 22/61] drm/omap: displays: Don't call disconnect handlers directly Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 23/61] drm/omap: dss: Move src and dst check and set to connection handlers Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 24/61] drm/omap: displays: Remove input omap_dss_device from panel data Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 25/61] drm/omap: dsi: Simplify debugfs implementation Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 26/61] drm/omap: Move DSI debugfs clocks dump to dsi%u_clks files Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 27/61] drm/omap: dss: Remove output devices list Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 28/61] drm/omap: dss: Rename for_each_dss_dev macro to for_each_dss_display Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 29/61] drm/omap: dss: Make omap_dss_get_next_device() more generic Laurent Pinchart
2018-08-06 0:27 ` Laurent Pinchart [this message]
2018-08-06 0:27 ` [PATCH v3 31/61] drm/omap: dss: Remove panel devices list Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 32/61] drm/omap: dss: Move and rename omap_dss_(get|put)_device() Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 33/61] drm/omap: dss: Store dss_device pointer in omap_dss_device Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 34/61] drm/omap: dss: Move DSS mgr ops and private data to dss_device Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 35/61] drm/omap: dss: Modify omapdss_find_output_from_display() to return channel Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 36/61] drm/omap: dss: Replace omap_dss_device port number with bitmask Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 37/61] drm/omap: dss: Extend omapdss_of_find_source_for_first_ep() to sinks Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 38/61] drm/omap: displays: Don't cast dssdev to panel data unnecessarily Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 39/61] drm/omap: dss: Cleanup error paths in output init functions Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 40/61] drm/omap: dss: dsi: Move initialization code from bind to probe Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 41/61] drm/omap: dss: hdmi4: " Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 42/61] drm/omap: dss: hdmi5: " Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 43/61] drm/omap: dss: venc: " Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 44/61] drm/omap: dss: Acquire next dssdev at probe time Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 45/61] drm/omap: dss: Add for_each_dss_output() macro Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 46/61] drm/omap: dss: Add function to retrieve display for an output Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 47/61] drm/omap: dss: Remove duplicated parameter to dss_mgr_(dis)connect() Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 48/61] drm/omap: dss: Get regulators at probe time Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 49/61] drm/omap: Remove unneeded variable assignments in omap_modeset_init Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 50/61] drm/omap: Create all planes before CRTCs Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 51/61] drm/omap: Group CRTC, encoder, connector and dssdev in a structure Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 52/61] drm/omap: Reverse direction of DSS device (dis)connect operations Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 53/61] drm/omap: dss: Move connection checks to omapdss_device_(dis)connect Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 54/61] drm/omap: dss: Move display type validation to initialization time Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 55/61] drm/omap: dss: Merge two disconnection helpers Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 56/61] drm/omap: Pass pipe pointer to omap_crtc_init() Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 57/61] drm/omap: Store CRTC lookup by channel table in omap_drm_private Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 58/61] drm/omap: Remove omap_crtc_output global array Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 59/61] drm/omap: Remove supported output check in CRTC connect handler Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 60/61] drm/omap: Set dispc_channel_connect from DSS output connect handlers Laurent Pinchart
2018-08-06 0:27 ` [PATCH v3 61/61] drm/omap: dss: Remove the dss_mgr_(dis)connect() operations Laurent Pinchart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180806002741.30929-31-laurent.pinchart@ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=tomi.valkeinen@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.