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 50/51] drm/omap: dss: Inline the omapdss_display_get() function
Date: Sun, 16 Feb 2020 23:03:07 +0200 [thread overview]
Message-ID: <20200216210308.17312-51-laurent.pinchart@ideasonboard.com> (raw)
In-Reply-To: <20200216210308.17312-1-laurent.pinchart@ideasonboard.com>
Inline the omapdss_display_get() in its only caller to simplify the
code.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
drivers/gpu/drm/omapdrm/dss/display.c | 9 ---------
drivers/gpu/drm/omapdrm/dss/omapdss.h | 1 -
drivers/gpu/drm/omapdrm/omap_drv.c | 7 ++++---
3 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/dss/display.c b/drivers/gpu/drm/omapdrm/dss/display.c
index 8a3f61f5825f..3b82158b1bfd 100644
--- a/drivers/gpu/drm/omapdrm/dss/display.c
+++ b/drivers/gpu/drm/omapdrm/dss/display.c
@@ -40,15 +40,6 @@ void omapdss_display_init(struct omap_dss_device *dssdev)
}
EXPORT_SYMBOL_GPL(omapdss_display_init);
-struct omap_dss_device *omapdss_display_get(struct omap_dss_device *output)
-{
- while (output->next)
- output = output->next;
-
- return omapdss_device_get(output);
-}
-EXPORT_SYMBOL_GPL(omapdss_display_get);
-
int omapdss_display_get_modes(struct drm_connector *connector,
const struct videomode *vm)
{
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 64aedc50cb0b..6ecbc7273032 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -432,7 +432,6 @@ static inline bool omapdss_is_initialized(void)
}
void omapdss_display_init(struct omap_dss_device *dssdev);
-struct omap_dss_device *omapdss_display_get(struct omap_dss_device *output);
int omapdss_display_get_modes(struct drm_connector *connector,
const struct videomode *vm);
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index e6a065030523..cdafd7ef1c32 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -207,11 +207,12 @@ static int omap_display_id(struct omap_dss_device *output)
struct device_node *node = NULL;
if (output->next) {
- struct omap_dss_device *display;
+ struct omap_dss_device *display = output;
+
+ while (display->next)
+ display = display->next;
- display = omapdss_display_get(output);
node = display->dev->of_node;
- omapdss_device_put(display);
} else if (output->bridge) {
struct drm_bridge *bridge = output->bridge;
--
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:[~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 ` [PATCH v6 22/51] drm/omap: dss: Fix output next device lookup in DT Laurent Pinchart
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 ` Laurent Pinchart [this message]
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-51-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).