From: Sebastian Reichel <sre@kernel.org>
To: Sebastian Reichel <sre@kernel.org>,
Tony Lindgren <tony@atomide.com>,
Aaro Koskinen <aaro.koskinen@iki.fi>,
Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
David Airlie <airlied@linux.ie>,
linux-omap@vger.kernel.org, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 10/23] drm: omapdrm: crtc: detect manually updated displays
Date: Tue, 8 Mar 2016 17:39:42 +0100 [thread overview]
Message-ID: <1457455195-1938-11-git-send-email-sre@kernel.org> (raw)
In-Reply-To: <1457455195-1938-1-git-send-email-sre@kernel.org>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
---
drivers/gpu/drm/omapdrm/omap_crtc.c | 31 ++++++++++++++++++++++++++++++-
drivers/gpu/drm/omapdrm/omap_drv.h | 1 +
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index 78ef9773cca1..8967013c1fb5 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -48,6 +48,7 @@ struct omap_crtc {
struct omap_overlay_manager *mgr;
struct omap_video_timings timings;
+ bool manually_updated;
struct omap_drm_irq vblank_irq;
struct omap_drm_irq error_irq;
@@ -90,6 +91,12 @@ int omap_crtc_wait_pending(struct drm_crtc *crtc)
msecs_to_jiffies(50));
}
+bool omap_crtc_is_manual_updated(struct drm_crtc *crtc)
+{
+ struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
+ return omap_crtc->manually_updated;
+}
+
/* -----------------------------------------------------------------------------
* DSS Manager Functions
*/
@@ -154,6 +161,11 @@ static void omap_crtc_set_enabled(struct drm_crtc *crtc, bool enable)
omap_crtc->ignore_digit_sync_lost = true;
}
+ if (omap_crtc->manually_updated) {
+ dev_dbg(dev->dev, "stallmode detected, not waiting for irq");
+ return;
+ }
+
framedone_irq = dispc_mgr_get_framedone_irq(channel);
vsync_irq = dispc_mgr_get_vsync_irq(channel);
@@ -233,7 +245,13 @@ static void omap_crtc_dss_set_lcd_config(struct omap_overlay_manager *mgr,
const struct dss_lcd_mgr_config *config)
{
struct omap_crtc *omap_crtc = omap_crtcs[mgr->id];
- DBG("%s", omap_crtc->name);
+ struct drm_device *dev = omap_crtc->base.dev;
+ struct drm_plane *plane;
+
+ dev_dbg(dev->dev, "set lcd config for %s", omap_crtc->name);
+
+ omap_crtc->manually_updated = dss_lcd_mgr_config_get_stallmode(config);
+
dispc_mgr_set_lcd_config(omap_crtc->channel, config);
}
@@ -358,10 +376,18 @@ static bool omap_crtc_mode_fixup(struct drm_crtc *crtc,
static void omap_crtc_enable(struct drm_crtc *crtc)
{
struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
+ struct omap_dss_device *display = omap_crtc->mgr->output->dst;
struct drm_device *dev = crtc->dev;
DBG("%s", omap_crtc->name);
+ /* manual updated display will not trigger vsync irq */
+ /* omap_crtc->manually_updated is not yet set */
+ if (display->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
+ dev_dbg(dev->dev, "manual update display detected!");
+ return;
+ }
+
if (test_and_set_bit(crtc_pending, &omap_crtc->state))
dev_warn(dev->dev, "crtc enable while pending bit set!");
@@ -407,6 +433,9 @@ static void omap_crtc_atomic_flush(struct drm_crtc *crtc,
WARN_ON(omap_crtc->vblank_irq.registered);
+ if (omap_crtc->manually_updated)
+ return;
+
if (dispc_mgr_is_enabled(omap_crtc->channel)) {
DBG("%s: GO", omap_crtc->name);
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h
index 5dfa93a3b505..71e2c2284b86 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.h
+++ b/drivers/gpu/drm/omapdrm/omap_drv.h
@@ -155,6 +155,7 @@ void omap_crtc_pre_uninit(void);
struct drm_crtc *omap_crtc_init(struct drm_device *dev,
struct drm_plane *plane, enum omap_channel channel, int id);
int omap_crtc_wait_pending(struct drm_crtc *crtc);
+bool omap_crtc_is_manual_updated(struct drm_crtc *crtc);
struct drm_plane *omap_plane_init(struct drm_device *dev,
int id, enum drm_plane_type type);
--
2.7.0
next prev parent reply other threads:[~2016-03-08 16:50 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-08 16:39 [PATCH 00/23] Nokia N950 display support Sebastian Reichel
2016-03-08 16:39 ` [PATCH 01/23] ARM: dts: n9/n950: regulator configuration Sebastian Reichel
2016-03-08 16:39 ` [PATCH 02/23] ARM: dts: n950: add display support Sebastian Reichel
2016-03-17 12:14 ` Laurent Pinchart
2016-03-17 17:49 ` Sebastian Reichel
2016-03-23 12:40 ` Jani Nikula
2016-03-23 14:01 ` Sebastian Reichel
2016-03-24 10:03 ` Jani Nikula
2016-03-24 14:26 ` Sebastian Reichel
2016-03-24 15:11 ` Jani Nikula
2016-03-25 0:15 ` Sebastian Reichel
2016-04-12 20:51 ` Tony Lindgren
2016-06-21 11:01 ` Tony Lindgren
2016-06-24 0:30 ` Sebastian Reichel
2016-03-08 16:39 ` [PATCH 03/23] drm: omapdrm: dss: reset dsi module during initialization Sebastian Reichel
2016-05-10 12:07 ` Tomi Valkeinen
2016-03-08 16:39 ` [PATCH 04/23] drm: omapdrm: add DSI mapping Sebastian Reichel
2016-03-26 9:09 ` Laurent Pinchart
2016-05-10 12:08 ` Tomi Valkeinen
2016-03-08 16:39 ` [PATCH 05/23] Revert "drm: omapdrm: Remove manual update display support" Sebastian Reichel
2016-03-08 16:39 ` [PATCH 06/23] drm: omapdrm: wait for pending operations before updating plane Sebastian Reichel
2016-03-26 9:20 ` Laurent Pinchart
2016-03-26 15:52 ` Sebastian Reichel
2016-03-08 16:39 ` [PATCH 07/23] drm: omapdrm: crtc: switch pending variable to atomic bitset Sebastian Reichel
2016-03-26 16:30 ` Laurent Pinchart
2016-03-08 16:39 ` [PATCH 08/23] drm: omapdrm: crtc: add enabled bit to state Sebastian Reichel
2016-03-26 16:35 ` Laurent Pinchart
2016-03-08 16:39 ` [PATCH 09/23] drm: omapdrm: dss: method to get stallmode from lcd config Sebastian Reichel
2016-03-08 16:39 ` Sebastian Reichel [this message]
2016-03-26 16:51 ` [PATCH 10/23] drm: omapdrm: crtc: detect manually updated displays Laurent Pinchart
2016-03-08 16:39 ` [PATCH 11/23] include: video: omapdss: provide fifo threshold methods Sebastian Reichel
2016-03-26 16:44 ` Laurent Pinchart
2016-03-08 16:39 ` [PATCH 12/23] drm: omapdrm: plane: update fifo size on atomic update Sebastian Reichel
2016-12-13 17:35 ` Laurent Pinchart
2016-12-14 8:43 ` Tomi Valkeinen
2016-12-14 9:10 ` Laurent Pinchart
2016-12-14 9:14 ` Tomi Valkeinen
2016-12-14 14:03 ` Sebastian Reichel
2016-12-14 21:36 ` Laurent Pinchart
2016-12-15 8:40 ` Tomi Valkeinen
2016-03-08 16:39 ` [PATCH 13/23] drm: omapdrm: crtc: update plane fifos on lcd config change Sebastian Reichel
2016-03-26 17:00 ` Laurent Pinchart
2016-03-08 16:39 ` [PATCH 14/23] drm: omapdrm: crtc: save framedone callback from dss Sebastian Reichel
2016-03-26 17:03 ` Laurent Pinchart
2016-03-08 16:39 ` [PATCH 15/23] drm: omapdrm: crtc: add support for manual updated displays Sebastian Reichel
2016-03-08 16:39 ` [PATCH 16/23] drm: omapdrm: update manual displays on dirty ioctl Sebastian Reichel
2016-03-08 16:39 ` [PATCH 17/23] drm: omapdrm: panel-dsi-cm: add regulator support Sebastian Reichel
2016-03-08 16:39 ` [PATCH 18/23] drm: omapdrm: panel-dsi-cm: use threaded irq handler Sebastian Reichel
2016-05-10 12:19 ` Tomi Valkeinen
2016-03-08 16:39 ` [PATCH 19/23] drm: omapdrm: panel-dsi-cm: improve DT support Sebastian Reichel
2016-03-08 16:39 ` [PATCH 20/23] drm: omapdrm: panel-dsi-cm: add offset support Sebastian Reichel
2016-03-08 16:39 ` [PATCH 21/23] drm: omapdrm: panel-dsi-cm: block disable until update completed Sebastian Reichel
2016-03-08 16:39 ` [PATCH 22/23] drm: omapdrm: panel-dsi-cm: ratelimit debug output in update path Sebastian Reichel
2016-03-08 16:39 ` [PATCH 23/23] drm: omapdrm: panel-dsi-cm: provide timings methods for omapdrm Sebastian Reichel
2016-03-08 18:39 ` [PATCH 00/23] Nokia N950 display support Aaro Koskinen
2016-03-08 20:45 ` Sebastian Reichel
2016-03-09 7:10 ` Tomi Valkeinen
2016-03-09 14:33 ` Sebastian Reichel
2016-03-09 21:02 ` Aaro Koskinen
2016-03-09 16:19 ` Emil Velikov
2016-03-09 16:24 ` Tomi Valkeinen
2016-03-09 16:58 ` Emil Velikov
2016-03-09 17:09 ` Sebastian Reichel
2016-03-28 12:34 ` Emil Velikov
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=1457455195-1938-11-git-send-email-sre@kernel.org \
--to=sre@kernel.org \
--cc=aaro.koskinen@iki.fi \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=tomi.valkeinen@ti.com \
--cc=tony@atomide.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).