From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: dri-devel@lists.freedesktop.org
Cc: Marek Vasut <marex@denx.de>,
robert.chiras@nxp.com, leonard.crestez@nxp.com,
linux-imx@nxp.com, kernel@pengutronix.de
Subject: [PATCH v3 14/22] drm: mxsfb: Enable vblank handling
Date: Wed, 17 Jun 2020 19:40:07 +0300 [thread overview]
Message-ID: <20200617164015.30448-15-laurent.pinchart@ideasonboard.com> (raw)
In-Reply-To: <20200617164015.30448-1-laurent.pinchart@ideasonboard.com>
Enable vblank handling when the CRTC is turned on and disable it when it
is turned off. This requires moving vblank init after the KMS pipeline
initialisation, otherwise drm_vblank_init() gets called with 0 CRTCs.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Stefan Agner <stefan@agner.ch>
---
drivers/gpu/drm/mxsfb/mxsfb_drv.c | 15 +++++++++------
drivers/gpu/drm/mxsfb/mxsfb_kms.c | 6 +++++-
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
index 752373803055..cece90101731 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
@@ -161,12 +161,6 @@ static int mxsfb_load(struct drm_device *drm, unsigned long flags)
pm_runtime_enable(drm->dev);
- ret = drm_vblank_init(drm, drm->mode_config.num_crtc);
- if (ret < 0) {
- dev_err(drm->dev, "Failed to initialise vblank\n");
- goto err_vblank;
- }
-
/* Modeset init */
drm_mode_config_init(drm);
@@ -176,6 +170,15 @@ static int mxsfb_load(struct drm_device *drm, unsigned long flags)
goto err_vblank;
}
+ ret = drm_vblank_init(drm, drm->mode_config.num_crtc);
+ if (ret < 0) {
+ dev_err(drm->dev, "Failed to initialise vblank\n");
+ goto err_vblank;
+ }
+
+ /* Start with vertical blanking interrupt reporting disabled. */
+ drm_crtc_vblank_off(&mxsfb->crtc);
+
ret = mxsfb_attach_bridge(mxsfb);
if (ret) {
dev_err(drm->dev, "Cannot connect bridge: %d\n", ret);
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_kms.c b/drivers/gpu/drm/mxsfb/mxsfb_kms.c
index a8172fd6cd41..aa9e962bb026 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_kms.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_kms.c
@@ -322,8 +322,10 @@ static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc,
dma_addr_t paddr;
pm_runtime_get_sync(drm->dev);
-
mxsfb_enable_axi_clk(mxsfb);
+
+ drm_crtc_vblank_on(crtc);
+
mxsfb_crtc_mode_set_nofb(mxsfb);
/* Write cur_buf as well to avoid an initial corrupt frame */
@@ -353,6 +355,8 @@ static void mxsfb_crtc_atomic_disable(struct drm_crtc *crtc,
}
spin_unlock_irq(&drm->event_lock);
+ drm_crtc_vblank_off(crtc);
+
mxsfb_disable_axi_clk(mxsfb);
pm_runtime_put_sync(drm->dev);
}
--
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-06-17 16:41 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-17 16:39 [PATCH v3 00/22] drm: mxsfb: Add i.MX7 support Laurent Pinchart
2020-06-17 16:39 ` [PATCH v3 01/22] drm: mxsfb: Remove fbdev leftovers Laurent Pinchart
2020-06-17 16:39 ` [PATCH v3 02/22] drm: mxsfb: Use drm_panel_bridge Laurent Pinchart
2020-06-17 16:39 ` [PATCH v3 03/22] drm: mxsfb: Use BIT() macro to define register bitfields Laurent Pinchart
2020-06-17 16:39 ` [PATCH v3 04/22] drm: mxsfb: Remove unused macros from mxsfb_regs.h Laurent Pinchart
2020-06-17 16:39 ` [PATCH v3 05/22] drm: mxsfb: Clarify format and bus width configuration Laurent Pinchart
2020-06-17 16:39 ` [PATCH v3 06/22] drm: mxsfb: Pass mxsfb_drm_private pointer to mxsfb_reset_block() Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 07/22] drm: mxsfb: Use LCDC_CTRL register name explicitly Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 08/22] drm: mxsfb: Remove register definitions from mxsfb_crtc.c Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 09/22] drm: mxsfb: Remove unneeded includes Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 10/22] drm: mxsfb: Rename mxsfb_crtc.c to mxsfb_kms.c Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 11/22] drm: mxsfb: Stop using DRM simple display pipeline helper Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 12/22] drm: mxsfb: Move vblank event arm to CRTC .atomic_flush() Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 13/22] drm: mxsfb: Don't touch AXI clock in IRQ context Laurent Pinchart
2020-06-17 16:40 ` Laurent Pinchart [this message]
2020-06-17 16:40 ` [PATCH v3 15/22] drm: mxsfb: Remove mxsfb_devdata unused fields Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 16/22] drm: mxsfb: Add i.MX7 and i.MX8M to the list of supported SoCs in Kconfig Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 17/22] drm: mxsfb: Update internal IP version number for i.MX6SX Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 18/22] drm: mxsfb: Drop non-OF support Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 19/22] drm: mxsfb: Turn mxsfb_set_pixel_fmt() into a void function Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 20/22] drm: mxsfb: Merge mxsfb_set_pixel_fmt() and mxsfb_set_bus_fmt() Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 21/22] drm: mxsfb: Remove unnecessary spaces after tab Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 22/22] drm: mxsfb: Support the alpha plane 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=20200617164015.30448-15-laurent.pinchart@ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=kernel@pengutronix.de \
--cc=leonard.crestez@nxp.com \
--cc=linux-imx@nxp.com \
--cc=marex@denx.de \
--cc=robert.chiras@nxp.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).