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 v7 47/54] drm/omap: dpi: Simplify clock setting API
Date: Sat, 22 Feb 2020 17:00:59 +0200 [thread overview]
Message-ID: <20200222150106.22919-48-laurent.pinchart@ideasonboard.com> (raw)
In-Reply-To: <20200222150106.22919-1-laurent.pinchart@ideasonboard.com>
The dpi_set_pll_clk() and dpi_set_dispc_clk() return various information
through pointer arguments that are never used by the callers. Remove
them to simplify the clock setting API.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tested-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
drivers/gpu/drm/omapdrm/dss/dpi.c | 32 ++++++++-----------------------
1 file changed, 8 insertions(+), 24 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c
index dccf81e4ce64..c167bd1116ec 100644
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -287,9 +287,7 @@ static bool dpi_dss_clk_calc(struct dpi_data *dpi, unsigned long pck,
-static int dpi_set_pll_clk(struct dpi_data *dpi, enum omap_channel channel,
- unsigned long pck_req, unsigned long *fck, int *lck_div,
- int *pck_div)
+static int dpi_set_pll_clk(struct dpi_data *dpi, unsigned long pck_req)
{
struct dpi_clk_calc_ctx ctx;
int r;
@@ -303,19 +301,15 @@ static int dpi_set_pll_clk(struct dpi_data *dpi, enum omap_channel channel,
if (r)
return r;
- dss_select_lcd_clk_source(dpi->dss, channel, dpi->clk_src);
+ dss_select_lcd_clk_source(dpi->dss, dpi->output.dispc_channel,
+ dpi->clk_src);
dpi->mgr_config.clock_info = ctx.dispc_cinfo;
- *fck = ctx.pll_cinfo.clkout[ctx.clkout_idx];
- *lck_div = ctx.dispc_cinfo.lck_div;
- *pck_div = ctx.dispc_cinfo.pck_div;
-
return 0;
}
-static int dpi_set_dispc_clk(struct dpi_data *dpi, unsigned long pck_req,
- unsigned long *fck, int *lck_div, int *pck_div)
+static int dpi_set_dispc_clk(struct dpi_data *dpi, unsigned long pck_req)
{
struct dpi_clk_calc_ctx ctx;
int r;
@@ -331,29 +325,19 @@ static int dpi_set_dispc_clk(struct dpi_data *dpi, unsigned long pck_req,
dpi->mgr_config.clock_info = ctx.dispc_cinfo;
- *fck = ctx.fck;
- *lck_div = ctx.dispc_cinfo.lck_div;
- *pck_div = ctx.dispc_cinfo.pck_div;
-
return 0;
}
static int dpi_set_mode(struct dpi_data *dpi)
{
- int lck_div = 0, pck_div = 0;
- unsigned long fck = 0;
- int r = 0;
+ int r;
if (dpi->pll)
- r = dpi_set_pll_clk(dpi, dpi->output.dispc_channel,
- dpi->pixelclock, &fck, &lck_div, &pck_div);
+ r = dpi_set_pll_clk(dpi, dpi->pixelclock);
else
- r = dpi_set_dispc_clk(dpi, dpi->pixelclock, &fck,
- &lck_div, &pck_div);
- if (r)
- return r;
+ r = dpi_set_dispc_clk(dpi, dpi->pixelclock);
- return 0;
+ return r;
}
static void dpi_config_lcd_manager(struct dpi_data *dpi)
--
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-22 15:03 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-22 15:00 [PATCH v7 00/54] drm/omap: Replace custom display drivers with drm_bridge and drm_panel Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 01/54] video: hdmi: Change return type of hdmi_avi_infoframe_init() to void Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 02/54] drm/connector: Add helper to get a connector type name Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 03/54] drm/edid: Add flag to drm_display_info to identify HDMI sinks Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 04/54] drm/bridge: Document the drm_encoder.bridge_chain field as private Laurent Pinchart
2020-02-25 15:25 ` Boris Brezillon
2020-02-22 15:00 ` [PATCH v7 05/54] drm/bridge: Fix atomic state ops documentation Laurent Pinchart
2020-02-25 15:28 ` Boris Brezillon
2020-02-22 15:00 ` [PATCH v7 06/54] drm/bridge: Improve overview documentation Laurent Pinchart
2020-02-22 15:32 ` Daniel Vetter
2020-02-22 15:34 ` Laurent Pinchart
2020-02-22 16:48 ` [PATCH v7.1 " Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 07/54] drm/bridge: Add connector-related bridge operations and data Laurent Pinchart
2020-02-22 15:34 ` Daniel Vetter
2020-02-22 15:00 ` [PATCH v7 08/54] drm/bridge: Add interlace_allowed flag to drm_bridge Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 09/54] drm/bridge: Extend bridge API to disable connector creation Laurent Pinchart
2020-02-22 16:49 ` [PATCH v7.1 " Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 10/54] drm/bridge: dumb-vga-dac: Rename internal symbols to simple-bridge Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 11/54] drm/bridge: dumb-vga-dac: Rename driver " Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 12/54] drm/bridge: simple-bridge: Add support for non-VGA bridges Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 13/54] drm/bridge: simple-bridge: Add support for enable GPIO Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 14/54] drm/bridge: simple-bridge: Add support for the TI OPA362 Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 15/54] drm/bridge: Add bridge driver for display connectors Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 16/54] drm/bridge: Add driver for the TI TPD12S015 HDMI level shifter Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 17/54] drm/bridge: panel: Implement bridge connector operations Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 18/54] drm/bridge: tfp410: Replace manual connector handling with bridge Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 19/54] drm/bridge: tfp410: Allow operation without drm_connector Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 20/54] drm: Add helper to create a connector for a chain of bridges Laurent Pinchart
2020-02-22 15:43 ` Daniel Vetter
2020-02-22 16:50 ` [PATCH v7.1 " Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 21/54] drm/omap: dss: Cleanup DSS ports on initialisation failure Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 22/54] drm/omap: Simplify HDMI mode and infoframe configuration Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 23/54] drm/omap: Factor out display type to connector type conversion Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 24/54] drm/omap: Use the drm_panel_bridge API Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 25/54] drm/omap: dss: Fix output next device lookup in DT Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 26/54] drm/omap: Add infrastructure to support drm_bridge local to DSS outputs Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 27/54] drm/omap: dss: Make omap_dss_device_ops optional Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 28/54] drm/omap: hdmi: Allocate EDID in the .read_edid() operation Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 29/54] drm/omap: hdmi4: Rework EDID read to isolate data read Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 30/54] drm/omap: hdmi5: " Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 31/54] drm/omap: hdmi4: Register a drm_bridge for EDID read Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 32/54] drm/omap: hdmi5: " Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 33/54] drm/omap: hdmi4: Move mode set, enable and disable operations to bridge Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 34/54] drm/omap: hdmi5: " Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 35/54] drm/omap: hdmi4: Implement drm_bridge .hpd_notify() operation Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 36/54] drm/omap: dss: Remove .set_hdmi_mode() and .set_infoframe() operations Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 37/54] drm/omap: venc: Register a drm_bridge Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 38/54] drm/omap: Create connector for bridges Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 39/54] drm/omap: Switch the HDMI and VENC outputs to drm_bridge Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 40/54] drm/omap: Remove HPD, detect and EDID omapdss operations Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 41/54] drm/omap: hdmi: Remove omap_dss_device operations Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 42/54] drm/omap: venc: " Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 43/54] drm/omap: hdmi4: Simplify EDID read Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 44/54] drm/omap: hdmi5: " Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 45/54] drm/omap: dpi: Sort includes alphabetically Laurent Pinchart
2020-02-22 15:00 ` [PATCH v7 46/54] drm/omap: dpi: Reorder functions in sections Laurent Pinchart
2020-02-22 15:00 ` Laurent Pinchart [this message]
2020-02-22 15:01 ` [PATCH v7 48/54] drm/omap: dpi: Register a drm_bridge Laurent Pinchart
2020-02-22 15:01 ` [PATCH v7 49/54] drm/omap: sdi: Sort includes alphabetically Laurent Pinchart
2020-02-22 15:01 ` [PATCH v7 50/54] drm/omap: sdi: Register a drm_bridge Laurent Pinchart
2020-02-22 15:01 ` [PATCH v7 51/54] drm/omap: Hardcode omap_connector type to DSI Laurent Pinchart
2020-02-22 15:01 ` [PATCH v7 52/54] drm/omap: dss: Inline the omapdss_display_get() function Laurent Pinchart
2020-02-22 15:01 ` [PATCH v7 53/54] drm/omap: dss: Remove unused omapdss_of_find_connected_device() function Laurent Pinchart
2020-02-22 15:01 ` [PATCH v7 54/54] drm/omap: dss: Remove unused omap_dss_device 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=20200222150106.22919-48-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).