mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stefan Agner <stefan@agner.ch>
To: thierry.reding@gmail.com, airlied@linux.ie,
	dri-devel@lists.freedesktop.org, stefan@agner.ch
Cc: alison.wang@freescale.com, jianwei.wang.chn@gmail.com,
	meng.yi@nxp.com, alexander.stein@systec-electronic.com,
	linux-kernel@vger.kernel.org
Subject: [PATCH v2 6/6] drm/fsl-dcu: disable vblank events on CRTC disable
Date: Fri,  3 Jun 2016 15:56:44 -0700	[thread overview]
Message-ID: <1464994604-4473-7-git-send-email-stefan@agner.ch> (raw)
In-Reply-To: <1464994604-4473-1-git-send-email-stefan@agner.ch>

Disable vblank events when CRTC gets disabled. This avoids an
external abort when entering suspend while disable_timer is still
active: On resume the timer might fire immediately and cause a
register access in fsl_dcu_drm_disable_vblank before clocks get
enabled by the resume function.

Signed-off-by: Stefan Agner <stefan@agner.ch>
---
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c
index ca0f7d83..36df2eb 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c
@@ -43,6 +43,8 @@ static void fsl_dcu_drm_disable_crtc(struct drm_crtc *crtc)
 	struct drm_device *dev = crtc->dev;
 	struct fsl_dcu_drm_device *fsl_dev = dev->dev_private;
 
+	drm_crtc_vblank_off(crtc);
+
 	regmap_update_bits(fsl_dev->regmap, DCU_DCU_MODE,
 			   DCU_MODE_DCU_MODE_MASK,
 			   DCU_MODE_DCU_MODE(DCU_MODE_OFF));
@@ -60,6 +62,8 @@ static void fsl_dcu_drm_crtc_enable(struct drm_crtc *crtc)
 			   DCU_MODE_DCU_MODE(DCU_MODE_NORMAL));
 	regmap_write(fsl_dev->regmap, DCU_UPDATE_MODE,
 		     DCU_UPDATE_MODE_READREG);
+
+	drm_crtc_vblank_on(crtc);
 }
 
 static void fsl_dcu_drm_crtc_mode_set_nofb(struct drm_crtc *crtc)
-- 
2.8.2

      parent reply	other threads:[~2016-06-03 22:57 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-03 22:56 [PATCH v2 0/6] drm/fsl-dcu: suspend/resume rework using atomic helpers Stefan Agner
2016-06-03 22:56 ` [PATCH v2 1/6] drm/fb_cma_helper: add suspend helper Stefan Agner
2016-06-03 23:09   ` Daniel Vetter
2016-06-03 22:56 ` [PATCH v2 2/6] drm/fsl-dcu: store layer registers in soc_data Stefan Agner
2016-06-03 22:56 ` [PATCH v2 3/6] drm/fsl-dcu: move layer initialization to plane file Stefan Agner
2016-06-03 22:56 ` [PATCH v2 4/6] drm/fsl-dcu: use clk helpers Stefan Agner
2016-06-03 22:56 ` [PATCH v2 5/6] drm/fsl-dcu: implement suspend/resume using atomic helpers Stefan Agner
2016-06-03 23:13   ` Daniel Vetter
2016-06-03 22:56 ` Stefan Agner [this message]

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=1464994604-4473-7-git-send-email-stefan@agner.ch \
    --to=stefan@agner.ch \
    --cc=airlied@linux.ie \
    --cc=alexander.stein@systec-electronic.com \
    --cc=alison.wang@freescale.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=jianwei.wang.chn@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=meng.yi@nxp.com \
    --cc=thierry.reding@gmail.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

all inboxes | Powered by JetHome®