From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: "Javier Martinez Canillas" <javier@osg.samsung.com>,
linux-samsung-soc@vger.kernel.org,
"Bartlomiej Zolnierkiewicz" <b.zolnierkie@samsung.com>,
"Michel Dänzer" <michel@daenzer.net>,
dri-devel@lists.freedesktop.org,
"Krzysztof Kozlowski" <krzk@kernel.org>,
"Marek Szyprowski" <m.szyprowski@samsung.com>
Subject: [PATCH v3 03/12] drm/exynos/decon5433: fix vblank event handling
Date: Mon, 13 Mar 2017 08:31:47 +0100 [thread overview]
Message-ID: <1489390307-22816-1-git-send-email-a.hajda@samsung.com> (raw)
In-Reply-To: <58C63D1F.3030701@samsung.com>
Current implementation of event handling assumes that vblank interrupt is
always called at the right time. It is not true, it can be delayed due to
various reasons. As a result different races can happen. The patch fixes
the issue by using hardware frame counter present in DECON to serialize
vblank and commit completion events.
Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
v3:
- handle wrap-around of frame counter
v2:
- added internal decon_get_frame_count function,
- updated frame counter on flush,
- misc style fixes (thank Inki)
---
drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 78 ++++++++++++++++++++++++++-
include/video/exynos5433_decon.h | 8 +++
2 files changed, 85 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
index 147911e..73482d3 100644
--- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
@@ -68,6 +68,8 @@ struct decon_context {
unsigned long flags;
unsigned long out_type;
int first_win;
+ spinlock_t vblank_lock;
+ u32 frame_id;
};
static const uint32_t decon_formats[] = {
@@ -122,6 +124,48 @@ static void decon_disable_vblank(struct exynos_drm_crtc *crtc)
writel(0, ctx->addr + DECON_VIDINTCON0);
}
+/* return number of starts/ends of frame transmissions since reset */
+static u32 decon_get_frame_count(struct decon_context *ctx, bool end)
+{
+ u32 frm, pfrm, status, cnt = 2;
+
+ /* To get consistent result repeat read until frame id is stable.
+ * Usually the loop will be executed once, in rare cases when the loop
+ * is executed at frame change time 2nd pass will be needed.
+ */
+ frm = readl(ctx->addr + DECON_CRFMID);
+ do {
+ status = readl(ctx->addr + DECON_VIDCON1);
+ pfrm = frm;
+ frm = readl(ctx->addr + DECON_CRFMID);
+ } while (frm != pfrm && --cnt);
+
+ /* CRFMID is incremented on BPORCH in case of I80 and on VSYNC in case
+ * of RGB, it should be taken into account.
+ */
+ if (!frm)
+ return 0;
+
+ switch (status & (VIDCON1_VSTATUS_MASK | VIDCON1_I80_ACTIVE)) {
+ case VIDCON1_VSTATUS_VS:
+ if (!(ctx->out_type & IFTYPE_I80))
+ --frm;
+ break;
+ case VIDCON1_VSTATUS_BP:
+ --frm;
+ break;
+ case VIDCON1_I80_ACTIVE:
+ case VIDCON1_VSTATUS_AC:
+ if (end)
+ --frm;
+ break;
+ default:
+ break;
+ }
+
+ return frm;
+}
+
static void decon_setup_trigger(struct decon_context *ctx)
{
if (!(ctx->out_type & (IFTYPE_I80 | I80_HW_TRG)))
@@ -365,11 +409,14 @@ static void decon_disable_plane(struct exynos_drm_crtc *crtc,
static void decon_atomic_flush(struct exynos_drm_crtc *crtc)
{
struct decon_context *ctx = crtc->ctx;
+ unsigned long flags;
int i;
if (test_bit(BIT_SUSPENDED, &ctx->flags))
return;
+ spin_lock_irqsave(&ctx->vblank_lock, flags);
+
for (i = ctx->first_win; i < WINDOWS_NR; i++)
decon_shadow_protect_win(ctx, i, false);
@@ -378,12 +425,18 @@ static void decon_atomic_flush(struct exynos_drm_crtc *crtc)
if (ctx->out_type & IFTYPE_I80)
set_bit(BIT_WIN_UPDATED, &ctx->flags);
+
+ ctx->frame_id = decon_get_frame_count(ctx, true);
+
exynos_crtc_handle_event(crtc);
+
+ spin_unlock_irqrestore(&ctx->vblank_lock, flags);
}
static void decon_swreset(struct decon_context *ctx)
{
unsigned int tries;
+ unsigned long flags;
writel(0, ctx->addr + DECON_VIDCON0);
for (tries = 2000; tries; --tries) {
@@ -401,6 +454,10 @@ static void decon_swreset(struct decon_context *ctx)
WARN(tries == 0, "failed to software reset DECON\n");
+ spin_lock_irqsave(&ctx->vblank_lock, flags);
+ ctx->frame_id = 0;
+ spin_unlock_irqrestore(&ctx->vblank_lock, flags);
+
if (!(ctx->out_type & IFTYPE_HDMI))
return;
@@ -579,6 +636,24 @@ static const struct component_ops decon_component_ops = {
.unbind = decon_unbind,
};
+static void decon_handle_vblank(struct decon_context *ctx)
+{
+ u32 frm;
+
+ spin_lock(&ctx->vblank_lock);
+
+ frm = decon_get_frame_count(ctx, true);
+
+ if (frm != ctx->frame_id) {
+ /* handle only if incremented, take care of wrap-around */
+ if ((s32)(frm - ctx->frame_id) > 0)
+ drm_crtc_handle_vblank(&ctx->crtc->base);
+ ctx->frame_id = frm;
+ }
+
+ spin_unlock(&ctx->vblank_lock);
+}
+
static irqreturn_t decon_irq_handler(int irq, void *dev_id)
{
struct decon_context *ctx = dev_id;
@@ -599,7 +674,7 @@ static irqreturn_t decon_irq_handler(int irq, void *dev_id)
(VIDOUT_INTERLACE_EN_F | VIDOUT_INTERLACE_FIELD_F))
return IRQ_HANDLED;
}
- drm_crtc_handle_vblank(&ctx->crtc->base);
+ decon_handle_vblank(ctx);
}
out:
@@ -672,6 +747,7 @@ static int exynos5433_decon_probe(struct platform_device *pdev)
__set_bit(BIT_SUSPENDED, &ctx->flags);
ctx->dev = dev;
ctx->out_type = (unsigned long)of_device_get_match_data(dev);
+ spin_lock_init(&ctx->vblank_lock);
if (ctx->out_type & IFTYPE_HDMI) {
ctx->first_win = 1;
diff --git a/include/video/exynos5433_decon.h b/include/video/exynos5433_decon.h
index ef8e2a8..352fc0d 100644
--- a/include/video/exynos5433_decon.h
+++ b/include/video/exynos5433_decon.h
@@ -46,6 +46,7 @@
#define DECON_FRAMEFIFO_STATUS 0x0524
#define DECON_CMU 0x1404
#define DECON_UPDATE 0x1410
+#define DECON_CRFMID 0x1414
#define DECON_UPDATE_SCHEME 0x1438
#define DECON_VIDCON1 0x2000
#define DECON_VIDCON2 0x2004
@@ -142,6 +143,13 @@
#define STANDALONE_UPDATE_F (1 << 0)
/* DECON_VIDCON1 */
+#define VIDCON1_LINECNT_MASK (0x0fff << 16)
+#define VIDCON1_I80_ACTIVE (1 << 15)
+#define VIDCON1_VSTATUS_MASK (0x3 << 13)
+#define VIDCON1_VSTATUS_VS (0 << 13)
+#define VIDCON1_VSTATUS_BP (1 << 13)
+#define VIDCON1_VSTATUS_AC (2 << 13)
+#define VIDCON1_VSTATUS_FP (3 << 13)
#define VIDCON1_VCLK_MASK (0x3 << 9)
#define VIDCON1_VCLK_RUN_VDEN_DISABLE (0x3 << 9)
#define VIDCON1_VCLK_HOLD (0x0 << 9)
--
2.7.4
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2017-03-13 7:31 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20170308145900eucas1p25d1fd7a33ad2bb9fa8c911a3b923546b@eucas1p2.samsung.com>
2017-03-08 14:58 ` [PATCH v2 00/12] drm/exynos: rework vblank handling Andrzej Hajda
[not found] ` <CGME20170308145901eucas1p21056f416d8a34fc5af4a4b89ed48ad5a@eucas1p2.samsung.com>
2017-03-08 14:58 ` [PATCH v2 01/12] drm/exynos: move crtc event handling to drivers callbacks Andrzej Hajda
[not found] ` <CGME20170308145901eucas1p2e7695c1d9fa43378d0a298b029d11269@eucas1p2.samsung.com>
2017-03-08 14:58 ` [PATCH v2 02/12] drm/exynos: simplify completion event handling Andrzej Hajda
[not found] ` <CGME20170308145902eucas1p24636df9b8eafd2b07f12a2c700c6bcea@eucas1p2.samsung.com>
2017-03-08 14:58 ` [PATCH v2 03/12] drm/exynos/decon5433: fix vblank " Andrzej Hajda
2017-03-09 3:54 ` Michel Dänzer
2017-03-09 6:54 ` Andrzej Hajda
2017-03-13 6:33 ` Inki Dae
[not found] ` <CGME20170313073211eucas1p17a7cdf647b711343ef382adb792ed84e@eucas1p1.samsung.com>
2017-03-13 7:31 ` Andrzej Hajda [this message]
[not found] ` <CGME20170308145902eucas1p131a3e6700da4e72c6d4ca1a4f74e5893@eucas1p1.samsung.com>
2017-03-08 14:58 ` [PATCH v2 04/12] drm/exynos/decon5433: implement frame counter Andrzej Hajda
[not found] ` <CGME20170308145902eucas1p2ef76c359292764dfe2a04312a1ee8dfb@eucas1p2.samsung.com>
2017-03-08 14:58 ` [PATCH v2 05/12] drm/exynos/decon5433: signal frame done interrupt at front porch Andrzej Hajda
[not found] ` <CGME20170308145903eucas1p27b43f06a1c172d33d7143df9f10ce1b0@eucas1p2.samsung.com>
2017-03-08 14:58 ` [PATCH v2 06/12] drm/exynos/fimd: " Andrzej Hajda
[not found] ` <CGME20170308145903eucas1p2a64c7cd562dfddf43dbbe5dd9281edc6@eucas1p2.samsung.com>
2017-03-08 14:58 ` [PATCH v2 07/12] drm/exynos/decon5433: fix software trigger mask Andrzej Hajda
[not found] ` <CGME20170308145904eucas1p2cf66bf512f2fed9961dff807e3b2af0f@eucas1p2.samsung.com>
2017-03-08 14:58 ` [PATCH v2 08/12] drm/exynos: kill exynos_drm_crtc::pipe Andrzej Hajda
[not found] ` <CGME20170308145905eucas1p10b5d39a4c72461a9fa3a33da8d3e3b00@eucas1p1.samsung.com>
2017-03-08 14:58 ` [PATCH v2 09/12] drm/exynos: kill exynos_drm_private::pipe Andrzej Hajda
[not found] ` <CGME20170308145905eucas1p2b562042b430d53f74fc5bdd3097ef21d@eucas1p2.samsung.com>
2017-03-08 14:58 ` [PATCH v2 10/12] drm/exynos: set plane possible_crtcs in exynos_plane_init Andrzej Hajda
[not found] ` <CGME20170308145906eucas1p24caed8fd5f3eda8c4e1ece3c2a8a6091@eucas1p2.samsung.com>
2017-03-08 14:58 ` [PATCH v2 11/12] drm/exynos: kill pipe field from drivers contexts Andrzej Hajda
[not found] ` <CGME20170308145906eucas1p206bb5875e635d3516ae00a2ac168175e@eucas1p2.samsung.com>
2017-03-08 14:58 ` [PATCH v2 12/12] drm/exynos: kill mode_set_nofb callback Andrzej Hajda
2017-03-14 1:28 ` [PATCH v2 00/12] drm/exynos: rework vblank handling Inki Dae
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=1489390307-22816-1-git-send-email-a.hajda@samsung.com \
--to=a.hajda@samsung.com \
--cc=b.zolnierkie@samsung.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=inki.dae@samsung.com \
--cc=javier@osg.samsung.com \
--cc=krzk@kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=michel@daenzer.net \
/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).