From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
To: Maxime Ripard <mripard@kernel.org>
Cc: michael@amarulasolutions.com, linux-amarula@amarulasolutions.com,
Dario Binacchi <dario.binacchi@amarulasolutions.com>,
David Airlie <airlied@gmail.com>,
Fabio Estevam <festevam@gmail.com>, Frank Li <Frank.Li@nxp.com>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Marek Vasut <marex@denx.de>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Sascha Hauer <s.hauer@pengutronix.de>,
Simona Vetter <simona@ffwll.ch>, Stefan Agner <stefan@agner.ch>,
Thomas Zimmermann <tzimmermann@suse.de>,
dri-devel@lists.freedesktop.org, imx@lists.linux.dev,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [RFC PATCH 5/8] drm/mxsfb: Stop the controller in hw_reset
Date: Sun, 22 Nov 2026 16:30:05 +0100 [thread overview]
Message-ID: <20261122153032.2782768-6-dario.binacchi@amarulasolutions.com> (raw)
In-Reply-To: <20261122153032.2782768-1-dario.binacchi@amarulasolutions.com>
When the hardware state can't be read out, a controller left running
by the bootloader is reprogrammed while running on the first enable.
Stop it in the hw_reset hook.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
drivers/gpu/drm/mxsfb/mxsfb_drv.c | 2 ++
drivers/gpu/drm/mxsfb/mxsfb_kms.c | 33 ++++++++++++++++++++++++++++++-
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
index c8bc79264361..ef4a47d238ed 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
@@ -31,6 +31,7 @@
#include <drm/drm_gem_dma_helper.h>
#include <drm/drm_gem_framebuffer_helper.h>
#include <drm/drm_mode_config.h>
+#include <drm/drm_modeset_helper.h>
#include <drm/drm_module.h>
#include <drm/drm_of.h>
#include <drm/drm_panel.h>
@@ -110,6 +111,7 @@ static const struct drm_mode_config_funcs mxsfb_mode_config_funcs = {
.fb_create = mxsfb_fb_create,
.atomic_check = drm_atomic_helper_check,
.atomic_commit = drm_atomic_helper_commit,
+ .hw_reset = drm_mode_config_helper_hw_reset,
};
static const struct drm_mode_config_helper_funcs mxsfb_mode_config_helpers = {
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_kms.c b/drivers/gpu/drm/mxsfb/mxsfb_kms.c
index bbc2a2df9f16..96cd80c6e76c 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_kms.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_kms.c
@@ -35,6 +35,18 @@
/* 1 second delay should be plenty of time for block reset */
#define RESET_TIMEOUT 1000000
+static void mxsfb_hw_get(struct mxsfb_drm_private *mxsfb)
+{
+ pm_runtime_get_sync(mxsfb->drm->dev);
+ mxsfb_enable_axi_clk(mxsfb);
+}
+
+static void mxsfb_hw_put(struct mxsfb_drm_private *mxsfb)
+{
+ mxsfb_disable_axi_clk(mxsfb);
+ pm_runtime_put_sync(mxsfb->drm->dev);
+}
+
/* -----------------------------------------------------------------------------
* CRTC
*/
@@ -205,7 +217,7 @@ static void mxsfb_enable_controller(struct mxsfb_drm_private *mxsfb)
writel(CTRL_RUN, mxsfb->base + LCDC_CTRL + REG_SET);
}
-static void mxsfb_disable_controller(struct mxsfb_drm_private *mxsfb)
+static void mxsfb_stop_controller(struct mxsfb_drm_private *mxsfb)
{
u32 reg;
@@ -221,6 +233,11 @@ static void mxsfb_disable_controller(struct mxsfb_drm_private *mxsfb)
reg = readl(mxsfb->base + LCDC_VDCTRL4);
reg &= ~VDCTRL4_SYNC_SIGNALS_ON;
writel(reg, mxsfb->base + LCDC_VDCTRL4);
+}
+
+static void mxsfb_disable_controller(struct mxsfb_drm_private *mxsfb)
+{
+ mxsfb_stop_controller(mxsfb);
clk_disable_unprepare(mxsfb->clk);
if (mxsfb->clk_disp_axi)
@@ -433,6 +450,19 @@ static void mxsfb_crtc_atomic_disable(struct drm_crtc *crtc,
pm_runtime_put_sync(drm->dev);
}
+static void mxsfb_crtc_hw_reset(struct drm_crtc *crtc)
+{
+ struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(crtc->dev);
+
+ mxsfb_hw_get(mxsfb);
+
+ /* The bootloader may have left the controller running */
+ if (readl(mxsfb->base + LCDC_CTRL) & CTRL_RUN)
+ mxsfb_stop_controller(mxsfb);
+
+ mxsfb_hw_put(mxsfb);
+}
+
static int mxsfb_crtc_enable_vblank(struct drm_crtc *crtc)
{
struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(crtc->dev);
@@ -493,6 +523,7 @@ static const struct drm_crtc_helper_funcs mxsfb_crtc_helper_funcs = {
.atomic_flush = mxsfb_crtc_atomic_flush,
.atomic_enable = mxsfb_crtc_atomic_enable,
.atomic_disable = mxsfb_crtc_atomic_disable,
+ .hw_reset = mxsfb_crtc_hw_reset,
};
static const struct drm_crtc_funcs mxsfb_crtc_funcs = {
--
2.43.0
next prev parent reply other threads:[~2026-11-22 15:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-22 15:30 [RFC PATCH 0/8] drm: State readout for the i.MX8MN display pipeline Dario Binacchi
2026-11-22 15:30 ` [RFC PATCH 1/8] drm/bridge: Add atomic_sro_install_state hook Dario Binacchi
2026-11-22 15:30 ` [RFC PATCH 2/8] drm/panel: Add sro_install hook Dario Binacchi
2026-11-22 15:30 ` [RFC PATCH 3/8] drm/mxsfb: Use the bridge connector Dario Binacchi
2026-11-22 15:30 ` [RFC PATCH 4/8] drm/mxsfb: Switch to drm_mode_config_create_initial_state() Dario Binacchi
2026-11-22 15:30 ` Dario Binacchi [this message]
2026-11-22 15:30 ` [RFC PATCH 6/8] drm/mxsfb: Implement hw state readout Dario Binacchi
2026-11-22 15:30 ` [RFC PATCH 7/8] drm/bridge: samsung-dsim: " Dario Binacchi
2026-11-22 15:30 ` [RFC PATCH 8/8] drm/panel: synaptics-r63353: Support " Dario Binacchi
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=20261122153032.2782768-6-dario.binacchi@amarulasolutions.com \
--to=dario.binacchi@amarulasolutions.com \
--cc=Frank.Li@nxp.com \
--cc=airlied@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=festevam@gmail.com \
--cc=imx@lists.linux.dev \
--cc=kernel@pengutronix.de \
--cc=linux-amarula@amarulasolutions.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=marex@denx.de \
--cc=michael@amarulasolutions.com \
--cc=mripard@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=simona@ffwll.ch \
--cc=stefan@agner.ch \
--cc=tzimmermann@suse.de \
/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®