All of lore.kernel.org
 help / color / mirror / Atom feed
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: dri-devel@lists.freedesktop.org
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>,
	Sam Ravnborg <sam@ravnborg.org>,
	Sebastian Reichel <sebastian.reichel@collabora.com>,
	Boris Brezillon <bbrezillon@kernel.org>
Subject: [PATCH v6 22/51] drm/omap: dss: Fix output next device lookup in DT
Date: Sun, 16 Feb 2020 23:02:39 +0200	[thread overview]
Message-ID: <20200216210308.17312-23-laurent.pinchart@ideasonboard.com> (raw)
In-Reply-To: <20200216210308.17312-1-laurent.pinchart@ideasonboard.com>

The DSS core looks up the next device connected to an output by
traversing the OF graph. It currently hardcodes the local port number to
0, which breaks any output with a different port number (SDI on OMAP3
and any DPI output but the first one). Fix this by repurposing the
currently unused of_ports bitmask in omap_dss_device with an of_port
output port number, and use it to traverse the OF graph.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
 drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c | 2 +-
 drivers/gpu/drm/omapdrm/displays/connector-hdmi.c      | 2 +-
 drivers/gpu/drm/omapdrm/displays/encoder-opa362.c      | 2 +-
 drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c   | 2 +-
 drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c        | 2 +-
 drivers/gpu/drm/omapdrm/dss/dpi.c                      | 2 +-
 drivers/gpu/drm/omapdrm/dss/dsi.c                      | 2 +-
 drivers/gpu/drm/omapdrm/dss/hdmi4.c                    | 2 +-
 drivers/gpu/drm/omapdrm/dss/hdmi5.c                    | 2 +-
 drivers/gpu/drm/omapdrm/dss/omapdss.h                  | 4 ++--
 drivers/gpu/drm/omapdrm/dss/output.c                   | 3 +--
 drivers/gpu/drm/omapdrm/dss/sdi.c                      | 2 +-
 drivers/gpu/drm/omapdrm/dss/venc.c                     | 2 +-
 13 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index 0d20fab605d7..f36aa1885d39 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -55,7 +55,7 @@ static int tvc_probe(struct platform_device *pdev)
 	dssdev->type = OMAP_DISPLAY_TYPE_VENC;
 	dssdev->display = true;
 	dssdev->owner = THIS_MODULE;
-	dssdev->of_ports = BIT(0);
+	dssdev->of_port = 0;
 
 	omapdss_display_init(dssdev);
 	omapdss_device_register(dssdev);
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
index f5d69d810bb8..37c212491cd3 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
@@ -139,7 +139,7 @@ static int hdmic_probe(struct platform_device *pdev)
 	dssdev->type = OMAP_DISPLAY_TYPE_HDMI;
 	dssdev->display = true;
 	dssdev->owner = THIS_MODULE;
-	dssdev->of_ports = BIT(0);
+	dssdev->of_port = 0;
 	dssdev->ops_flags = ddata->hpd_gpio
 			  ? OMAP_DSS_DEVICE_OP_DETECT | OMAP_DSS_DEVICE_OP_HPD
 			  : 0;
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
index b992387ed674..252705222ef1 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
@@ -86,7 +86,7 @@ static int opa362_probe(struct platform_device *pdev)
 	dssdev->dev = &pdev->dev;
 	dssdev->type = OMAP_DISPLAY_TYPE_VENC;
 	dssdev->owner = THIS_MODULE;
-	dssdev->of_ports = BIT(1) | BIT(0);
+	dssdev->of_port = 1;
 
 	dssdev->next = omapdss_of_find_connected_device(pdev->dev.of_node, 1);
 	if (IS_ERR(dssdev->next)) {
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
index 089105c5aa0a..857ae84cd7d1 100644
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
@@ -165,7 +165,7 @@ static int tpd_probe(struct platform_device *pdev)
 	dssdev->dev = &pdev->dev;
 	dssdev->type = OMAP_DISPLAY_TYPE_HDMI;
 	dssdev->owner = THIS_MODULE;
-	dssdev->of_ports = BIT(1) | BIT(0);
+	dssdev->of_port = 1;
 	dssdev->ops_flags = OMAP_DSS_DEVICE_OP_DETECT
 			  | OMAP_DSS_DEVICE_OP_HPD;
 
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
index 3ec6a55e932a..3484b5d4a91c 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
@@ -1265,7 +1265,7 @@ static int dsicm_probe(struct platform_device *pdev)
 	dssdev->type = OMAP_DISPLAY_TYPE_DSI;
 	dssdev->display = true;
 	dssdev->owner = THIS_MODULE;
-	dssdev->of_ports = BIT(0);
+	dssdev->of_port = 0;
 	dssdev->ops_flags = OMAP_DSS_DEVICE_OP_MODES;
 
 	dssdev->caps = OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE |
diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c
index 95147437b990..462ed6f3118a 100644
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -625,7 +625,7 @@ static int dpi_init_output_port(struct dpi_data *dpi, struct device_node *port)
 	out->id = OMAP_DSS_OUTPUT_DPI;
 	out->type = OMAP_DISPLAY_TYPE_DPI;
 	out->dispc_channel = dpi_get_channel(dpi);
-	out->of_ports = BIT(port_num);
+	out->of_port = port_num;
 	out->ops = &dpi_ops;
 	out->owner = THIS_MODULE;
 
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index da16ea095f13..6379eea124d1 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -5116,7 +5116,7 @@ static int dsi_init_output(struct dsi_data *dsi)
 	out->dispc_channel = dsi_get_channel(dsi);
 	out->ops = &dsi_ops;
 	out->owner = THIS_MODULE;
-	out->of_ports = BIT(0);
+	out->of_port = 0;
 	out->bus_flags = DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE
 		       | DRM_BUS_FLAG_DE_HIGH
 		       | DRM_BUS_FLAG_SYNC_DRIVE_NEGEDGE;
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index 0f557fad4513..44075718407b 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -673,7 +673,7 @@ static int hdmi4_init_output(struct omap_hdmi *hdmi)
 	out->dispc_channel = OMAP_DSS_CHANNEL_DIGIT;
 	out->ops = &hdmi_ops;
 	out->owner = THIS_MODULE;
-	out->of_ports = BIT(0);
+	out->of_port = 0;
 	out->ops_flags = OMAP_DSS_DEVICE_OP_EDID;
 
 	r = omapdss_device_init_output(out);
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index d9463b332554..1b5bd44ee09d 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -657,7 +657,7 @@ static int hdmi5_init_output(struct omap_hdmi *hdmi)
 	out->dispc_channel = OMAP_DSS_CHANNEL_DIGIT;
 	out->ops = &hdmi_ops;
 	out->owner = THIS_MODULE;
-	out->of_ports = BIT(0);
+	out->of_port = 0;
 	out->ops_flags = OMAP_DSS_DEVICE_OP_EDID;
 
 	r = omapdss_device_init_output(out);
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index c5672e5174c5..b48a51d11310 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -436,8 +436,8 @@ struct omap_dss_device {
 	/* output instance */
 	enum omap_dss_output_id id;
 
-	/* bitmask of port numbers in DT */
-	unsigned int of_ports;
+	/* port number in DT */
+	unsigned int of_port;
 };
 
 struct omap_dss_driver {
diff --git a/drivers/gpu/drm/omapdrm/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c
index 99a253a424c1..c1ec9d343e53 100644
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -4,7 +4,6 @@
  * Author: Archit Taneja <archit@ti.com>
  */
 
-#include <linux/bitops.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
@@ -24,7 +23,7 @@ int omapdss_device_init_output(struct omap_dss_device *out)
 	int ret;
 
 	remote_node = of_graph_get_remote_node(out->dev->of_node,
-					       ffs(out->of_ports) - 1, 0);
+					       out->of_port, 0);
 	if (!remote_node) {
 		dev_dbg(out->dev, "failed to find video sink\n");
 		return 0;
diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
index 3b447c01fa2a..9092ed3d0ef1 100644
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -265,7 +265,7 @@ static int sdi_init_output(struct sdi_device *sdi)
 	out->name = "sdi.0";
 	out->dispc_channel = OMAP_DSS_CHANNEL_LCD;
 	/* We have SDI only on OMAP3, where it's on port 1 */
-	out->of_ports = BIT(1);
+	out->of_port = 1;
 	out->ops = &sdi_ops;
 	out->owner = THIS_MODULE;
 	out->bus_flags = DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE	/* 15.5.9.1.2 */
diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
index 596a297d5813..e2f480f689b8 100644
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -754,7 +754,7 @@ static int venc_init_output(struct venc_device *venc)
 	out->dispc_channel = OMAP_DSS_CHANNEL_DIGIT;
 	out->ops = &venc_ops;
 	out->owner = THIS_MODULE;
-	out->of_ports = BIT(0);
+	out->of_port = 0;
 	out->ops_flags = OMAP_DSS_DEVICE_OP_MODES;
 
 	r = omapdss_device_init_output(out);
-- 
Regards,

Laurent Pinchart

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2020-02-16 21:04 UTC|newest]

Thread overview: 68+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-16 21:02 [PATCH v6 00/51] drm/omap: Replace custom display drivers with drm_bridge and drm_panel Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 01/51] video: hdmi: Change return type of hdmi_avi_infoframe_init() to void Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 02/51] drm/connector: Add helper to get a connector type name Laurent Pinchart
2020-02-17  9:43   ` Daniel Vetter
2020-02-21 14:15     ` Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 03/51] drm/edid: Add flag to drm_display_info to identify HDMI sinks Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 04/51] drm/bridge: Add connector-related bridge operations and data Laurent Pinchart
2020-02-17  9:53   ` Daniel Vetter
2020-02-18  1:21     ` Laurent Pinchart
2020-02-18  6:44       ` Daniel Vetter
2020-02-21 14:23         ` Laurent Pinchart
2020-02-21 17:05           ` Daniel Vetter
2020-02-21 17:18           ` Sam Ravnborg
2020-02-22  9:02             ` Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 05/51] drm/bridge: Add interlace_allowed flag to drm_bridge Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 06/51] drm/bridge: Extend bridge API to disable connector creation Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 07/51] drm/bridge: dumb-vga-dac: Rename internal symbols to simple-bridge Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 08/51] drm/bridge: dumb-vga-dac: Rename driver " Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 09/51] drm/bridge: simple-bridge: Add support for non-VGA bridges Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 10/51] drm/bridge: simple-bridge: Add support for enable GPIO Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 11/51] drm/bridge: simple-bridge: Add support for the TI OPA362 Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 12/51] drm/bridge: Add bridge driver for display connectors Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 13/51] drm/bridge: Add driver for the TI TPD12S015 HDMI level shifter Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 14/51] drm/bridge: panel: Implement bridge connector operations Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 15/51] drm/bridge: tfp410: Replace manual connector handling with bridge Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 16/51] drm/bridge: tfp410: Allow operation without drm_connector Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 17/51] drm: Add helper to create a connector for a chain of bridges Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 18/51] drm/omap: dss: Cleanup DSS ports on initialisation failure Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 19/51] drm/omap: Simplify HDMI mode and infoframe configuration Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 20/51] drm/omap: Factor out display type to connector type conversion Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 21/51] drm/omap: Use the drm_panel_bridge API Laurent Pinchart
2020-02-16 21:02 ` Laurent Pinchart [this message]
2020-02-16 21:02 ` [PATCH v6 23/51] drm/omap: Add infrastructure to support drm_bridge local to DSS outputs Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 24/51] drm/omap: dss: Make omap_dss_device_ops optional Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 25/51] drm/omap: hdmi: Allocate EDID in the .read_edid() operation Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 26/51] drm/omap: hdmi4: Rework EDID read to isolate data read Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 27/51] drm/omap: hdmi5: " Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 28/51] drm/omap: hdmi4: Register a drm_bridge for EDID read Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 29/51] drm/omap: hdmi5: " Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 30/51] drm/omap: hdmi4: Move mode set, enable and disable operations to bridge Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 31/51] drm/omap: hdmi5: " Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 32/51] drm/omap: hdmi4: Implement drm_bridge .hpd_notify() operation Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 33/51] drm/omap: dss: Remove .set_hdmi_mode() and .set_infoframe() operations Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 34/51] drm/omap: venc: Register a drm_bridge Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 35/51] drm/omap: Create connector for bridges Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 36/51] drm/omap: Switch the HDMI and VENC outputs to drm_bridge Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 37/51] drm/omap: Remove HPD, detect and EDID omapdss operations Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 38/51] drm/omap: hdmi: Remove omap_dss_device operations Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 39/51] drm/omap: venc: " Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 40/51] drm/omap: hdmi4: Simplify EDID read Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 41/51] drm/omap: hdmi5: " Laurent Pinchart
2020-02-16 21:02 ` [PATCH v6 42/51] drm/omap: dpi: Sort includes alphabetically Laurent Pinchart
2020-02-16 21:03 ` [PATCH v6 43/51] drm/omap: dpi: Reorder functions in sections Laurent Pinchart
2020-02-16 21:03 ` [PATCH v6 44/51] drm/omap: dpi: Simplify clock setting API Laurent Pinchart
2020-02-16 21:03 ` [PATCH v6 45/51] drm/omap: dpi: Register a drm_bridge Laurent Pinchart
2020-02-21 12:25   ` Tomi Valkeinen
2020-02-16 21:03 ` [PATCH v6 46/51] drm/omap: sdi: Sort includes alphabetically Laurent Pinchart
2020-02-16 21:03 ` [PATCH v6 47/51] drm/omap: sdi: Register a drm_bridge Laurent Pinchart
2020-02-16 21:03 ` [PATCH v6 48/51] drm/omap: Hardcode omap_connector type to DSI Laurent Pinchart
2020-02-21 12:20   ` Tomi Valkeinen
2020-02-16 21:03 ` [PATCH v6 49/51] drm/omap: dss: Remove unused omap_dss_device operations Laurent Pinchart
2020-02-20 21:39   ` Sebastian Reichel
2020-02-20 21:45     ` Laurent Pinchart
2020-02-22  3:13       ` Sebastian Reichel
2020-02-16 21:03 ` [PATCH v6 50/51] drm/omap: dss: Inline the omapdss_display_get() function Laurent Pinchart
2020-02-16 21:03 ` [PATCH v6 51/51] drm/omap: dss: Remove unused omapdss_of_find_connected_device() function Laurent Pinchart
2020-02-17 23:00 ` [PATCH v6 00/51] drm/omap: Replace custom display drivers with drm_bridge and drm_panel Sebastian Reichel
2020-02-17 23:16   ` 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=20200216210308.17312-23-laurent.pinchart@ideasonboard.com \
    --to=laurent.pinchart@ideasonboard.com \
    --cc=bbrezillon@kernel.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=sam@ravnborg.org \
    --cc=sebastian.reichel@collabora.com \
    --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.