From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: dri-devel@lists.freedesktop.org
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Subject: [PATCH v2 15/22] drm/omap: Call dispc timings check operation directly
Date: Mon, 6 Aug 2018 23:36:55 +0300 [thread overview]
Message-ID: <20180806203702.16961-16-laurent.pinchart@ideasonboard.com> (raw)
In-Reply-To: <20180806203702.16961-1-laurent.pinchart@ideasonboard.com>
Instead of call the dispc timings check function dispc_mgr_timings_ok()
from the internal encoders .check_timings() operation, expose it through
the dispc ops (after renaming it to check_timings) and call it directly
from omapdrm. This allows removal of now empty omap_dss_device
.check_timings() operations.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
---
drivers/gpu/drm/omapdrm/dss/dispc.c | 18 ++++++++++--------
drivers/gpu/drm/omapdrm/dss/dpi.c | 4 ----
drivers/gpu/drm/omapdrm/dss/dss.h | 3 ---
drivers/gpu/drm/omapdrm/dss/hdmi4.c | 12 ------------
drivers/gpu/drm/omapdrm/dss/hdmi5.c | 12 ------------
drivers/gpu/drm/omapdrm/dss/omapdss.h | 3 +++
drivers/gpu/drm/omapdrm/dss/sdi.c | 6 ------
drivers/gpu/drm/omapdrm/omap_connector.c | 6 ++++++
drivers/gpu/drm/omapdrm/omap_encoder.c | 18 +++++++++++++-----
9 files changed, 32 insertions(+), 50 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
index da95dbfdf790..e61a9592a650 100644
--- a/drivers/gpu/drm/omapdrm/dss/dispc.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
@@ -3113,28 +3113,29 @@ static bool _dispc_mgr_pclk_ok(struct dispc_device *dispc,
return pclk <= dispc->feat->max_tv_pclk;
}
-bool dispc_mgr_timings_ok(struct dispc_device *dispc, enum omap_channel channel,
- const struct videomode *vm)
+static int dispc_mgr_check_timings(struct dispc_device *dispc,
+ enum omap_channel channel,
+ const struct videomode *vm)
{
if (!_dispc_mgr_size_ok(dispc, vm->hactive, vm->vactive))
- return false;
+ return MODE_BAD;
if (!_dispc_mgr_pclk_ok(dispc, channel, vm->pixelclock))
- return false;
+ return MODE_BAD;
if (dss_mgr_is_lcd(channel)) {
/* TODO: OMAP4+ supports interlace for LCD outputs */
if (vm->flags & DISPLAY_FLAGS_INTERLACED)
- return false;
+ return MODE_BAD;
if (!_dispc_lcd_timings_ok(dispc, vm->hsync_len,
vm->hfront_porch, vm->hback_porch,
vm->vsync_len, vm->vfront_porch,
vm->vback_porch))
- return false;
+ return MODE_BAD;
}
- return true;
+ return MODE_OK;
}
static void _dispc_mgr_set_lcd_timings(struct dispc_device *dispc,
@@ -3236,7 +3237,7 @@ static void dispc_mgr_set_timings(struct dispc_device *dispc,
DSSDBG("channel %d xres %u yres %u\n", channel, t.hactive, t.vactive);
- if (!dispc_mgr_timings_ok(dispc, channel, &t)) {
+ if (dispc_mgr_check_timings(dispc, channel, &t)) {
BUG();
return;
}
@@ -4733,6 +4734,7 @@ static const struct dispc_ops dispc_ops = {
.mgr_go_busy = dispc_mgr_go_busy,
.mgr_go = dispc_mgr_go,
.mgr_set_lcd_config = dispc_mgr_set_lcd_config,
+ .mgr_check_timings = dispc_mgr_check_timings,
.mgr_set_timings = dispc_mgr_set_timings,
.mgr_setup = dispc_mgr_setup,
.mgr_gamma_size = dispc_mgr_gamma_size,
diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c
index 58237decb5a8..d814d71fffbc 100644
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -496,7 +496,6 @@ static int dpi_check_timings(struct omap_dss_device *dssdev,
struct videomode *vm)
{
struct dpi_data *dpi = dpi_get_data_from_dssdev(dssdev);
- enum omap_channel channel = dpi->output.dispc_channel;
int lck_div, pck_div;
unsigned long fck;
unsigned long pck;
@@ -506,9 +505,6 @@ static int dpi_check_timings(struct omap_dss_device *dssdev,
if (vm->hactive % 8 != 0)
return -EINVAL;
- if (!dispc_mgr_timings_ok(dpi->dss->dispc, channel, vm))
- return -EINVAL;
-
if (vm->pixelclock == 0)
return -EINVAL;
diff --git a/drivers/gpu/drm/omapdrm/dss/dss.h b/drivers/gpu/drm/omapdrm/dss/dss.h
index ee06051933c5..37790c363128 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss.h
+++ b/drivers/gpu/drm/omapdrm/dss/dss.h
@@ -417,9 +417,6 @@ bool dispc_div_calc(struct dispc_device *dispc, unsigned long dispc_freq,
unsigned long pck_min, unsigned long pck_max,
dispc_div_calc_func func, void *data);
-bool dispc_mgr_timings_ok(struct dispc_device *dispc,
- enum omap_channel channel,
- const struct videomode *vm);
int dispc_calc_clock_rates(struct dispc_device *dispc,
unsigned long dispc_fclk_rate,
struct dispc_clock_info *cinfo);
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index a66bdbe3b969..3e2bc85ef538 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -251,17 +251,6 @@ static void hdmi_power_off_full(struct omap_hdmi *hdmi)
hdmi_power_off_core(hdmi);
}
-static int hdmi_display_check_timings(struct omap_dss_device *dssdev,
- struct videomode *vm)
-{
- struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
-
- if (!dispc_mgr_timings_ok(hdmi->dss->dispc, dssdev->dispc_channel, vm))
- return -EINVAL;
-
- return 0;
-}
-
static void hdmi_display_set_timings(struct omap_dss_device *dssdev,
const struct videomode *vm)
{
@@ -508,7 +497,6 @@ static const struct omap_dss_device_ops hdmi_ops = {
.enable = hdmi_display_enable,
.disable = hdmi_display_disable,
- .check_timings = hdmi_display_check_timings,
.set_timings = hdmi_display_set_timings,
.read_edid = hdmi_read_edid,
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index d63831c9eacf..c02e08299155 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -250,17 +250,6 @@ static void hdmi_power_off_full(struct omap_hdmi *hdmi)
hdmi_power_off_core(hdmi);
}
-static int hdmi_display_check_timings(struct omap_dss_device *dssdev,
- struct videomode *vm)
-{
- struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
-
- if (!dispc_mgr_timings_ok(hdmi->dss->dispc, dssdev->dispc_channel, vm))
- return -EINVAL;
-
- return 0;
-}
-
static void hdmi_display_set_timings(struct omap_dss_device *dssdev,
const struct videomode *vm)
{
@@ -502,7 +491,6 @@ static const struct omap_dss_device_ops hdmi_ops = {
.enable = hdmi_display_enable,
.disable = hdmi_display_disable,
- .check_timings = hdmi_display_check_timings,
.set_timings = hdmi_display_set_timings,
.read_edid = hdmi_read_edid,
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 251e092dfb05..1f698a95a94a 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -608,6 +608,9 @@ struct dispc_ops {
void (*mgr_set_lcd_config)(struct dispc_device *dispc,
enum omap_channel channel,
const struct dss_lcd_mgr_config *config);
+ int (*mgr_check_timings)(struct dispc_device *dispc,
+ enum omap_channel channel,
+ const struct videomode *vm);
void (*mgr_set_timings)(struct dispc_device *dispc,
enum omap_channel channel,
const struct videomode *vm);
diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
index 8e111afe5958..736a74db3ad5 100644
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -237,12 +237,6 @@ static void sdi_set_timings(struct omap_dss_device *dssdev,
static int sdi_check_timings(struct omap_dss_device *dssdev,
struct videomode *vm)
{
- struct sdi_device *sdi = dssdev_to_sdi(dssdev);
- enum omap_channel channel = dssdev->dispc_channel;
-
- if (!dispc_mgr_timings_ok(sdi->dss->dispc, channel, vm))
- return -EINVAL;
-
if (vm->pixelclock == 0)
return -EINVAL;
diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
index b8317b697083..98f5ca29444a 100644
--- a/drivers/gpu/drm/omapdrm/omap_connector.c
+++ b/drivers/gpu/drm/omapdrm/omap_connector.c
@@ -268,6 +268,8 @@ static int omap_connector_mode_valid(struct drm_connector *connector,
struct drm_display_mode *mode)
{
struct omap_connector *omap_connector = to_omap_connector(connector);
+ enum omap_channel channel = omap_connector->output->dispc_channel;
+ struct omap_drm_private *priv = connector->dev->dev_private;
struct omap_dss_device *dssdev;
struct videomode vm = {0};
struct drm_device *dev = connector->dev;
@@ -277,6 +279,10 @@ static int omap_connector_mode_valid(struct drm_connector *connector,
drm_display_mode_to_videomode(mode, &vm);
mode->vrefresh = drm_mode_vrefresh(mode);
+ r = priv->dispc_ops->mgr_check_timings(priv->dispc, channel, &vm);
+ if (r)
+ goto done;
+
for (dssdev = omap_connector->output; dssdev; dssdev = dssdev->next) {
if (!dssdev->ops->check_timings)
continue;
diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c
index 0177a2c4b77a..749d21a92edd 100644
--- a/drivers/gpu/drm/omapdrm/omap_encoder.c
+++ b/drivers/gpu/drm/omapdrm/omap_encoder.c
@@ -165,27 +165,35 @@ static int omap_encoder_atomic_check(struct drm_encoder *encoder,
struct drm_connector_state *conn_state)
{
struct omap_encoder *omap_encoder = to_omap_encoder(encoder);
+ enum omap_channel channel = omap_encoder->output->dispc_channel;
struct drm_device *dev = encoder->dev;
+ struct omap_drm_private *priv = dev->dev_private;
struct omap_dss_device *dssdev;
struct videomode vm = { 0 };
int ret;
drm_display_mode_to_videomode(&crtc_state->mode, &vm);
+ ret = priv->dispc_ops->mgr_check_timings(priv->dispc, channel, &vm);
+ if (ret)
+ goto done;
+
for (dssdev = omap_encoder->output; dssdev; dssdev = dssdev->next) {
if (!dssdev->ops->check_timings)
continue;
ret = dssdev->ops->check_timings(dssdev, &vm);
- if (ret) {
- dev_err(dev->dev, "invalid timings: %d\n", ret);
- return ret;
- }
+ if (ret)
+ goto done;
}
drm_display_mode_from_videomode(&vm, &crtc_state->adjusted_mode);
- return 0;
+done:
+ if (ret)
+ dev_err(dev->dev, "invalid timings: %d\n", ret);
+
+ return ret;
}
static const struct drm_encoder_helper_funcs omap_encoder_helper_funcs = {
--
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 20:36 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-06 20:22 [PATCH v2 00/21] omapdrm: Rework the HPD-related operations Laurent Pinchart
2018-08-06 20:22 ` [PATCH v2 01/21] drm/omap: dss: Remove unused omap_dss_driver operations Laurent Pinchart
2018-08-06 20:22 ` [PATCH v2 02/21] drm/omap: dss: Remove omap_dss_driver .[gs]et_mirror operations Laurent Pinchart
2018-08-06 20:22 ` [PATCH v2 03/21] drm/omap: Remove unnecessary display output sanity checks Laurent Pinchart
2018-08-06 20:22 ` [PATCH v2 04/21] drm/omap: Check omap_dss_device type based on the output_type field Laurent Pinchart
2018-08-06 20:28 ` [PATCH v2.1 " Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 00/22] omapdrm: Rework the timing-related operations Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 01/22] drm/omap: Pass both output and display omap_dss_device to connector init Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 02/22] drm/omap: Determine connector type directly in omap_connector.c Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 03/22] drm/omap: dss: hdmi: Rename hdmi_display_(set|check)_timing() functions Laurent Pinchart
2018-08-13 10:50 ` Tomi Valkeinen
2018-08-19 10:59 ` Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 04/22] drm/omap: Make the video_mode pointer to .set_timings() const Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 05/22] drm/omap: Remove duplicate calls to .set_timings() operation Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 06/22] drm/omap: Remove unneeded fallback for missing .check_timings() Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 07/22] drm/omap: Don't store video mode internally for external encoders Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 08/22] drm/omap: Store bus flags in the omap_dss_device structure Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 09/22] drm/omap: Don't call .check_timings() operation recursively Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 10/22] drm/omap: Query timing information from analog TV encoder Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 11/22] drm/omap: Remove .get_timings() operation from display connectors Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 12/22] drm/omap: panels: Don't modify fixed timings Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 13/22] drm/omap: Move bus flag hack to encoder implementation Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 14/22] drm/omap: Split mode fixup and mode set from encoder enable Laurent Pinchart
2018-08-06 20:36 ` Laurent Pinchart [this message]
2018-08-06 20:36 ` [PATCH v2 16/22] drm/omap: dpi: Don't fixup video mode in dpi_set_mode() Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 17/22] drm/omap: dsi: Fixup video mode in .set_config() operation Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 18/22] drm/omap: hdmi: Constify video mode and related pointers Laurent Pinchart
2018-08-06 20:36 ` [PATCH v2 19/22] drm/omap: sdi: Fixup video mode in .check_timings() operation Laurent Pinchart
2018-08-06 20:37 ` [PATCH v2 20/22] drm/omap: venc: " Laurent Pinchart
2018-08-06 20:37 ` [PATCH v2 21/22] drm/omap: Store CRTC timings in .set_timings() operation Laurent Pinchart
2018-08-06 20:37 ` [PATCH v2 22/22] drm/omap: Don't call .set_timings() operation recursively Laurent Pinchart
2018-08-13 11:12 ` [PATCH v2 00/22] omapdrm: Rework the timing-related operations Tomi Valkeinen
2018-08-13 19:24 ` Sebastian Reichel
2018-08-19 10:53 ` Laurent Pinchart
2018-08-20 11:24 ` Tomi Valkeinen
2018-08-20 11:33 ` Laurent Pinchart
2018-08-06 20:22 ` [PATCH v2 05/21] drm/omap: connector-hdmi: Convert to the GPIO descriptors API Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 06/21] drm/omap: encoder-tfp410: " Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 07/21] drm/omap: panel-nec-nl8048hl11: " Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 08/21] drm/omap: panel-sony-acx565akm: " Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 09/21] drm/omap: panel-tpo-td028ttec1: Drop unneeded linux/gpio.h header Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 10/21] drm/omap: panel-tpo-td043mtea1: Convert to the GPIO descriptors API Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 11/21] drm/omap: Move most omap_dss_driver operations to omap_dss_device_ops Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 12/21] drm/omap: dss: Add device operations flags Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 13/21] drm/omap: Don't call .detect() operation recursively Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 14/21] drm/omap: Don't call HPD registration operations recursively Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 15/21] drm/omap: Remove unneeded safety checks in the HPD operations Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 16/21] drm/omap: Merge HPD enable operation with HPD callback registration Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 17/21] drm/omap: Move HPD disconnection handling to omap_connector Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 18/21] drm/omap: Don't call EDID read operation recursively Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 19/21] drm/omap: Get from CRTC to display device directly Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 20/21] drm/omap: Pass both output and display omap_dss_device to encoder init Laurent Pinchart
2018-08-06 20:23 ` [PATCH v2 21/21] drm/omap: Don't call HDMI mode and infoframe operations recursively 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=20180806203702.16961-16-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.