* [RFC PATCH 0/8] drm: State readout for the i.MX8MN display pipeline
@ 2026-11-22 15:30 Dario Binacchi
2026-11-22 15:30 ` [RFC PATCH 1/8] drm/bridge: Add atomic_sro_install_state hook Dario Binacchi
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: Dario Binacchi @ 2026-11-22 15:30 UTC (permalink / raw)
To: Maxime Ripard
Cc: michael, linux-amarula, Dario Binacchi, Andrzej Hajda,
David Airlie, Fabio Estevam, Frank Li, Inki Dae, Jagan Teki,
Jernej Skrabec, Jessica Zhang, Jonas Karlman, Laurent Pinchart,
Luca Ceresoli, Maarten Lankhorst, Marek Szyprowski, Marek Vasut,
Neil Armstrong, Pengutronix Kernel Team, Robert Foss,
Sascha Hauer, Simona Vetter, Stefan Agner, Thomas Zimmermann,
dri-devel, imx, linux-arm-kernel, linux-kernel
This series implements the hardware state readout [1] for the display
pipeline of the i.MX8MN (LCDIF, Samsung DSIM, Synaptics R63353 panel),
so that the splash screen shown by the bootloader stays on, without a
modeset, until a client draws.
The first two patches add the hooks a bridge and a panel need to
acquire their resources (runtime PM, regulators) when they are found
enabled. They are a proposal, since the drivers converted so far
didn't need them.
The series is based on [1] and needs [2] to keep the power domains of
the display on.
Tested on i.MX8MN (BSH SMM S2 PRO).
[1] https://lore.kernel.org/r/20261106-drm-state-readout-v8-0-cbe78624e1bc@kernel.org
[2] https://lore.kernel.org/r/20261122095927.2631909-1-dario.binacchi@amarulasolutions.com
Dario Binacchi (8):
drm/bridge: Add atomic_sro_install_state hook
drm/panel: Add sro_install hook
drm/mxsfb: Use the bridge connector
drm/mxsfb: Switch to drm_mode_config_create_initial_state()
drm/mxsfb: Stop the controller in hw_reset
drm/mxsfb: Implement hw state readout
drm/bridge: samsung-dsim: Implement hw state readout
drm/panel: synaptics-r63353: Support hw state readout
drivers/gpu/drm/bridge/samsung-dsim.c | 125 +++++-
drivers/gpu/drm/drm_bridge.c | 41 ++
drivers/gpu/drm/drm_panel.c | 16 +
drivers/gpu/drm/mxsfb/Kconfig | 2 +
drivers/gpu/drm/mxsfb/mxsfb_drv.c | 31 +-
drivers/gpu/drm/mxsfb/mxsfb_kms.c | 394 +++++++++++++++++-
drivers/gpu/drm/mxsfb/mxsfb_regs.h | 3 +
.../gpu/drm/panel/panel-synaptics-r63353.c | 33 +-
include/drm/drm_bridge.h | 20 +
include/drm/drm_panel.h | 10 +
10 files changed, 642 insertions(+), 33 deletions(-)
---
base-commit: fe97bd8df0365f5aa27ea88b621e3f475bdd544d
branch: drm-sro-rfc
--
2.43.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [RFC PATCH 1/8] drm/bridge: Add atomic_sro_install_state hook
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 ` Dario Binacchi
2026-11-22 15:30 ` [RFC PATCH 2/8] drm/panel: Add sro_install hook Dario Binacchi
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Dario Binacchi @ 2026-11-22 15:30 UTC (permalink / raw)
To: Maxime Ripard
Cc: michael, linux-amarula, Dario Binacchi, Andrzej Hajda,
David Airlie, Jernej Skrabec, Jonas Karlman, Laurent Pinchart,
Luca Ceresoli, Maarten Lankhorst, Neil Armstrong, Robert Foss,
Simona Vetter, Thomas Zimmermann, dri-devel, linux-kernel
The CRTCs, planes, connectors and private objects can acquire the
resources needed to keep the hardware state active when a state read
out from the hardware is installed. Bridges can't, even though they
usually hold a runtime PM reference and track their enable state
while the pipeline is active.
Add the atomic_sro_install_state hook to the bridge funcs. It is
called only for the bridges of a pipeline that was read out as active.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
drivers/gpu/drm/drm_bridge.c | 41 ++++++++++++++++++++++++++++++++++++
include/drm/drm_bridge.h | 20 ++++++++++++++++++
2 files changed, 61 insertions(+)
diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c
index 81174015309f..f4b66a3b38fc 100644
--- a/drivers/gpu/drm/drm_bridge.c
+++ b/drivers/gpu/drm/drm_bridge.c
@@ -637,6 +637,46 @@ drm_bridge_atomic_readout_priv_state(struct drm_private_obj *obj,
return 0;
}
+/* The connector and CRTC states are installed before the bridge ones */
+static bool drm_bridge_sro_pipeline_is_active(struct drm_bridge *bridge)
+{
+ struct drm_connector_list_iter conn_iter;
+ struct drm_connector *connector;
+ bool active = false;
+
+ drm_connector_list_iter_begin(bridge->dev, &conn_iter);
+ drm_for_each_connector_iter(connector, &conn_iter) {
+ struct drm_connector_state *conn_state = connector->state;
+
+ if (!conn_state || conn_state->best_encoder != bridge->encoder)
+ continue;
+
+ if (conn_state->crtc && conn_state->crtc->state)
+ active = conn_state->crtc->state->active;
+
+ break;
+ }
+ drm_connector_list_iter_end(&conn_iter);
+
+ return active;
+}
+
+static void
+drm_bridge_atomic_install_priv_state(struct drm_private_obj *obj,
+ struct drm_private_state *priv_state)
+{
+ struct drm_bridge *bridge = drm_priv_to_bridge(obj);
+
+ if (!bridge->funcs->atomic_sro_install_state)
+ return;
+
+ if (!drm_bridge_sro_pipeline_is_active(bridge))
+ return;
+
+ bridge->funcs->atomic_sro_install_state(bridge,
+ drm_priv_to_bridge_state(priv_state));
+}
+
static bool drm_bridge_atomic_compare_priv_state(struct drm_private_obj *obj,
struct drm_printer *p,
struct drm_private_state *a,
@@ -682,6 +722,7 @@ static const struct drm_private_state_funcs drm_bridge_priv_state_funcs = {
static const struct drm_private_state_funcs drm_bridge_priv_state_funcs_with_sro = {
.atomic_sro_compare_state = drm_bridge_atomic_compare_priv_state,
.atomic_sro_readout_state = drm_bridge_atomic_readout_priv_state,
+ .atomic_sro_install_state = drm_bridge_atomic_install_priv_state,
.atomic_create_state = drm_bridge_atomic_create_priv_state,
.atomic_duplicate_state = drm_bridge_atomic_duplicate_priv_state,
.atomic_destroy_state = drm_bridge_atomic_destroy_priv_state,
diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h
index b73f3424ed62..eb65e1807410 100644
--- a/include/drm/drm_bridge.h
+++ b/include/drm/drm_bridge.h
@@ -341,6 +341,26 @@ struct drm_bridge_funcs {
struct drm_bridge_state *a,
struct drm_bridge_state *b);
+ /**
+ * @atomic_sro_install_state:
+ *
+ * This optional hook is called when a state read out from
+ * hardware is about to be installed as the bridge's current
+ * state, and the pipeline the bridge is part of was read out
+ * as active.
+ *
+ * It allows drivers to acquire the resources needed to keep
+ * the current hardware state active, such as power domains,
+ * clocks, or interrupts, and to align their internal state
+ * with what a regular enable sequence would have left.
+ *
+ * This hook cannot fail. It is called during
+ * drm_atomic_sro_install_state(), which is part of the
+ * hardware state readout initialization sequence.
+ */
+ void (*atomic_sro_install_state)(struct drm_bridge *bridge,
+ struct drm_bridge_state *bridge_state);
+
/**
* @atomic_duplicate_state:
*
--
2.43.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [RFC PATCH 2/8] drm/panel: Add sro_install hook
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 ` Dario Binacchi
2026-11-22 15:30 ` [RFC PATCH 3/8] drm/mxsfb: Use the bridge connector Dario Binacchi
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Dario Binacchi @ 2026-11-22 15:30 UTC (permalink / raw)
To: Maxime Ripard
Cc: michael, linux-amarula, Dario Binacchi, David Airlie,
Jessica Zhang, Maarten Lankhorst, Neil Armstrong, Simona Vetter,
Thomas Zimmermann, dri-devel, linux-kernel
The panel bridge assumes the panel is enabled whenever its pipeline
is read out as active, but the panel is left marked as unprepared and
disabled. The following disable is then skipped, and the panel driver
never gets the chance to acquire the resources it will release when
unprepared.
Add the sro_install hook, called when the state read out from the
hardware is installed. On success the panel is marked as prepared and
enabled.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
drivers/gpu/drm/drm_panel.c | 16 ++++++++++++++++
include/drm/drm_panel.h | 10 ++++++++++
2 files changed, 26 insertions(+)
diff --git a/drivers/gpu/drm/drm_panel.c b/drivers/gpu/drm/drm_panel.c
index bef0e6af73ba..daccf98e5513 100644
--- a/drivers/gpu/drm/drm_panel.c
+++ b/drivers/gpu/drm/drm_panel.c
@@ -346,6 +346,21 @@ panel_bridge_connector_readout(struct drm_bridge *bridge,
return 0;
}
+static void panel_bridge_install_state(struct drm_bridge *bridge,
+ struct drm_bridge_state *bridge_state)
+{
+ struct drm_panel *panel = drm_bridge_to_panel(bridge);
+
+ if (!panel->funcs || !panel->funcs->sro_install)
+ return;
+
+ if (panel->funcs->sro_install(panel))
+ return;
+
+ panel->prepared = true;
+ panel->enabled = true;
+}
+
static const struct drm_bridge_funcs panel_bridge_bridge_funcs = {
.attach = panel_bridge_attach,
.detach = panel_bridge_detach,
@@ -360,6 +375,7 @@ static const struct drm_bridge_funcs panel_bridge_bridge_funcs = {
.atomic_get_input_bus_fmts = drm_atomic_helper_bridge_propagate_bus_fmt,
.debugfs_init = panel_bridge_debugfs_init,
.atomic_sro_readout_state = panel_bridge_readout_state,
+ .atomic_sro_install_state = panel_bridge_install_state,
.atomic_sro_compare_state = drm_atomic_helper_bridge_compare_state,
.atomic_sro_connector_readout = panel_bridge_connector_readout,
};
diff --git a/include/drm/drm_panel.h b/include/drm/drm_panel.h
index 58113ea7d63a..66f9fc0828f1 100644
--- a/include/drm/drm_panel.h
+++ b/include/drm/drm_panel.h
@@ -148,6 +148,16 @@ struct drm_panel_funcs {
* Allows panels to create panels-specific debugfs files.
*/
void (*debugfs_init)(struct drm_panel *panel, struct dentry *root);
+
+ /**
+ * @sro_install:
+ *
+ * Acquire the resources of a panel found enabled when the hardware
+ * state was read out, without touching the hardware.
+ *
+ * This function is optional.
+ */
+ int (*sro_install)(struct drm_panel *panel);
};
struct drm_panel_follower_funcs {
--
2.43.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [RFC PATCH 3/8] drm/mxsfb: Use the bridge connector
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 ` Dario Binacchi
2026-11-22 15:30 ` [RFC PATCH 4/8] drm/mxsfb: Switch to drm_mode_config_create_initial_state() Dario Binacchi
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Dario Binacchi @ 2026-11-22 15:30 UTC (permalink / raw)
To: Maxime Ripard
Cc: michael, linux-amarula, Dario Binacchi, David Airlie,
Fabio Estevam, Frank Li, Maarten Lankhorst, Marek Vasut,
Pengutronix Kernel Team, Sascha Hauer, Simona Vetter,
Stefan Agner, Thomas Zimmermann, dri-devel, imx,
linux-arm-kernel, linux-kernel
The state readout of a connector is implemented by the bridge
connector helper. Use it, as the LCDIF driver already does, in place
of the connector each bridge creates on its own.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
The bridges used with this driver have not been checked one by one
for DRM_BRIDGE_ATTACH_NO_CONNECTOR support.
drivers/gpu/drm/mxsfb/Kconfig | 2 ++
drivers/gpu/drm/mxsfb/mxsfb_drv.c | 20 ++++++++++----------
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/mxsfb/Kconfig b/drivers/gpu/drm/mxsfb/Kconfig
index 31db7a824a93..78e983b71ec0 100644
--- a/drivers/gpu/drm/mxsfb/Kconfig
+++ b/drivers/gpu/drm/mxsfb/Kconfig
@@ -15,6 +15,8 @@ config DRM_MXSFB
select DRM_GEM_DMA_HELPER
select DRM_PANEL
select DRM_PANEL_BRIDGE
+ select DRM_DISPLAY_HELPER
+ select DRM_BRIDGE_CONNECTOR
help
Choose this option if you have an LCDIF or eLCDIF LCD controller.
Those devices are found in various i.MX SoC (including i.MX23,
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
index 641691fc92c8..038f5c896dcb 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
@@ -23,6 +23,7 @@
#include <drm/clients/drm_client_setup.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_bridge.h>
+#include <drm/drm_bridge_connector.h>
#include <drm/drm_connector.h>
#include <drm/drm_drv.h>
#include <drm/drm_fbdev_dma.h>
@@ -118,7 +119,7 @@ static const struct drm_mode_config_helper_funcs mxsfb_mode_config_helpers = {
static int mxsfb_attach_bridge(struct mxsfb_drm_private *mxsfb)
{
struct drm_device *drm = mxsfb->drm;
- struct drm_connector_list_iter iter;
+ struct drm_connector *connector;
struct drm_panel *panel;
struct drm_bridge *bridge;
int ret;
@@ -139,19 +140,18 @@ static int mxsfb_attach_bridge(struct mxsfb_drm_private *mxsfb)
if (!bridge)
return -ENODEV;
- ret = drm_bridge_attach(&mxsfb->encoder, bridge, NULL, 0);
+ ret = drm_bridge_attach(&mxsfb->encoder, bridge, NULL,
+ DRM_BRIDGE_ATTACH_NO_CONNECTOR);
if (ret)
return dev_err_probe(drm->dev, ret, "Failed to attach bridge\n");
- mxsfb->bridge = bridge;
+ connector = drm_bridge_connector_init(drm, &mxsfb->encoder);
+ if (IS_ERR(connector))
+ return dev_err_probe(drm->dev, PTR_ERR(connector),
+ "Failed to init bridge connector\n");
- /*
- * Get hold of the connector. This is a bit of a hack, until the bridge
- * API gives us bus flags and formats.
- */
- drm_connector_list_iter_begin(drm, &iter);
- mxsfb->connector = drm_connector_list_iter_next(&iter);
- drm_connector_list_iter_end(&iter);
+ mxsfb->bridge = bridge;
+ mxsfb->connector = connector;
return 0;
}
--
2.43.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [RFC PATCH 4/8] drm/mxsfb: Switch to drm_mode_config_create_initial_state()
2026-11-22 15:30 [RFC PATCH 0/8] drm: State readout for the i.MX8MN display pipeline Dario Binacchi
` (2 preceding siblings ...)
2026-11-22 15:30 ` [RFC PATCH 3/8] drm/mxsfb: Use the bridge connector Dario Binacchi
@ 2026-11-22 15:30 ` Dario Binacchi
2026-11-22 15:30 ` [RFC PATCH 5/8] drm/mxsfb: Stop the controller in hw_reset Dario Binacchi
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Dario Binacchi @ 2026-11-22 15:30 UTC (permalink / raw)
To: Maxime Ripard
Cc: michael, linux-amarula, Dario Binacchi, David Airlie,
Fabio Estevam, Frank Li, Maarten Lankhorst, Marek Vasut,
Pengutronix Kernel Team, Sascha Hauer, Simona Vetter,
Stefan Agner, Thomas Zimmermann, dri-devel, imx,
linux-arm-kernel, linux-kernel
The hardware state is read out only when the initial state is created
with drm_mode_config_create_initial_state().
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
drivers/gpu/drm/mxsfb/mxsfb_drv.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
index 038f5c896dcb..c8bc79264361 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
@@ -322,7 +322,11 @@ static int mxsfb_load(struct drm_device *drm,
drm->mode_config.funcs = &mxsfb_mode_config_funcs;
drm->mode_config.helper_private = &mxsfb_mode_config_helpers;
- drm_mode_config_reset(drm);
+ ret = drm_mode_config_create_initial_state(drm);
+ if (ret) {
+ dev_err(drm->dev, "Failed to create initial state\n");
+ goto err_vblank;
+ }
ret = platform_get_irq(pdev, 0);
if (ret < 0)
--
2.43.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [RFC PATCH 5/8] drm/mxsfb: Stop the controller in hw_reset
2026-11-22 15:30 [RFC PATCH 0/8] drm: State readout for the i.MX8MN display pipeline Dario Binacchi
` (3 preceding siblings ...)
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
2026-11-22 15:30 ` [RFC PATCH 6/8] drm/mxsfb: Implement hw state readout Dario Binacchi
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Dario Binacchi @ 2026-11-22 15:30 UTC (permalink / raw)
To: Maxime Ripard
Cc: michael, linux-amarula, Dario Binacchi, David Airlie,
Fabio Estevam, Frank Li, Maarten Lankhorst, Marek Vasut,
Pengutronix Kernel Team, Sascha Hauer, Simona Vetter,
Stefan Agner, Thomas Zimmermann, dri-devel, imx,
linux-arm-kernel, linux-kernel
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
^ permalink raw reply [flat|nested] 9+ messages in thread
* [RFC PATCH 6/8] drm/mxsfb: Implement hw state readout
2026-11-22 15:30 [RFC PATCH 0/8] drm: State readout for the i.MX8MN display pipeline Dario Binacchi
` (4 preceding siblings ...)
2026-11-22 15:30 ` [RFC PATCH 5/8] drm/mxsfb: Stop the controller in hw_reset Dario Binacchi
@ 2026-11-22 15:30 ` 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
7 siblings, 0 replies; 9+ messages in thread
From: Dario Binacchi @ 2026-11-22 15:30 UTC (permalink / raw)
To: Maxime Ripard
Cc: michael, linux-amarula, Dario Binacchi, David Airlie,
Fabio Estevam, Frank Li, Maarten Lankhorst, Marek Vasut,
Pengutronix Kernel Team, Sascha Hauer, Simona Vetter,
Stefan Agner, Thomas Zimmermann, dri-devel, imx,
linux-arm-kernel, linux-kernel
Read out the state of the CRTC and of the planes from the hardware,
so that the first modeset can be skipped when the bootloader has
already set up the display.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
drivers/gpu/drm/mxsfb/mxsfb_drv.c | 3 +
drivers/gpu/drm/mxsfb/mxsfb_kms.c | 361 ++++++++++++++++++++++++++++-
drivers/gpu/drm/mxsfb/mxsfb_regs.h | 3 +
3 files changed, 360 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
index ef4a47d238ed..6317a30f54ad 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
@@ -22,6 +22,7 @@
#include <drm/clients/drm_client_setup.h>
#include <drm/drm_atomic_helper.h>
+#include <drm/drm_atomic_state_readout_helper.h>
#include <drm/drm_bridge.h>
#include <drm/drm_bridge_connector.h>
#include <drm/drm_connector.h>
@@ -112,10 +113,12 @@ static const struct drm_mode_config_funcs mxsfb_mode_config_funcs = {
.atomic_check = drm_atomic_helper_check,
.atomic_commit = drm_atomic_helper_commit,
.hw_reset = drm_mode_config_helper_hw_reset,
+ .atomic_sro_readout_state = drm_atomic_helper_sro_readout_state,
};
static const struct drm_mode_config_helper_funcs mxsfb_mode_config_helpers = {
.atomic_commit_tail = drm_atomic_helper_commit_tail_rpm,
+ .atomic_sro_build_state = drm_atomic_helper_sro_build_state,
};
static int mxsfb_attach_bridge(struct mxsfb_drm_private *mxsfb)
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_kms.c b/drivers/gpu/drm/mxsfb/mxsfb_kms.c
index 96cd80c6e76c..242b03a903a5 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_kms.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_kms.c
@@ -13,10 +13,14 @@
#include <linux/iopoll.h>
#include <linux/media-bus-format.h>
#include <linux/pm_runtime.h>
+#include <linux/slab.h>
#include <linux/spinlock.h>
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
+#include <drm/drm_atomic_state_readout.h>
+#include <drm/drm_atomic_state_readout_helper.h>
+#include <drm/drm_atomic_uapi.h>
#include <drm/drm_bridge.h>
#include <drm/drm_crtc.h>
#include <drm/drm_encoder.h>
@@ -47,6 +51,36 @@ static void mxsfb_hw_put(struct mxsfb_drm_private *mxsfb)
pm_runtime_put_sync(mxsfb->drm->dev);
}
+/* The overlay plane starts 64 bytes within the framebuffer */
+#define MXSFB_AS_BUF_OFFSET 64
+
+/* Framebuffer read out from the hardware, without a GEM object */
+struct mxsfb_readout_fb {
+ struct drm_framebuffer base;
+ dma_addr_t dma_addr;
+};
+
+static void mxsfb_readout_fb_destroy(struct drm_framebuffer *fb)
+{
+ drm_framebuffer_cleanup(fb);
+ kfree(container_of(fb, struct mxsfb_readout_fb, base));
+}
+
+static const struct drm_framebuffer_funcs mxsfb_readout_fb_funcs = {
+ .destroy = mxsfb_readout_fb_destroy,
+};
+
+static dma_addr_t mxsfb_plane_get_dma_addr(struct drm_plane_state *pstate)
+{
+ struct drm_framebuffer *fb = pstate->fb;
+
+ if (fb->funcs == &mxsfb_readout_fb_funcs)
+ return container_of(fb, struct mxsfb_readout_fb,
+ base)->dma_addr;
+
+ return drm_fb_dma_get_gem_addr(fb, pstate, 0);
+}
+
/* -----------------------------------------------------------------------------
* CRTC
*/
@@ -418,7 +452,7 @@ static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc,
mxsfb_crtc_mode_set_nofb(mxsfb, bridge_state, bus_format);
/* Write cur_buf as well to avoid an initial corrupt frame */
- dma_addr = drm_fb_dma_get_gem_addr(new_pstate->fb, new_pstate, 0);
+ dma_addr = mxsfb_plane_get_dma_addr(new_pstate);
if (dma_addr) {
writel(dma_addr, mxsfb->base + mxsfb->devdata->cur_buf);
writel(dma_addr, mxsfb->base + mxsfb->devdata->next_buf);
@@ -463,6 +497,114 @@ static void mxsfb_crtc_hw_reset(struct drm_crtc *crtc)
mxsfb_hw_put(mxsfb);
}
+static bool mxsfb_is_running(struct mxsfb_drm_private *mxsfb)
+{
+ u32 mask = CTRL_RUN | CTRL_DOTCLK_MODE;
+
+ /* A controller being stopped keeps running until the end of frame */
+ return (readl(mxsfb->base + LCDC_CTRL) & mask) == mask;
+}
+
+static int mxsfb_readout_mode(struct mxsfb_drm_private *mxsfb,
+ struct drm_display_mode *mode)
+{
+ const struct mxsfb_devdata *devdata = mxsfb->devdata;
+ u32 ctrl, vdctrl0, vdctrl2, vdctrl3, reg;
+ u16 hsync_len, vsync_len;
+
+ ctrl = readl(mxsfb->base + LCDC_CTRL);
+ if (!(ctrl & CTRL_DOTCLK_MODE) || !(ctrl & CTRL_MASTER))
+ return -EINVAL;
+
+ vdctrl0 = readl(mxsfb->base + LCDC_VDCTRL0);
+ if (!(vdctrl0 & VDCTRL0_ENABLE_PRESENT) ||
+ !(vdctrl0 & VDCTRL0_VSYNC_PERIOD_UNIT) ||
+ !(vdctrl0 & VDCTRL0_VSYNC_PULSE_WIDTH_UNIT))
+ return -EINVAL;
+
+ reg = readl(mxsfb->base + devdata->transfer_count);
+ mode->hdisplay = TRANSFER_COUNT_GET_HCOUNT(reg);
+ mode->vdisplay = TRANSFER_COUNT_GET_VCOUNT(reg);
+
+ mode->vtotal = readl(mxsfb->base + LCDC_VDCTRL1);
+
+ vdctrl2 = readl(mxsfb->base + LCDC_VDCTRL2);
+ mode->htotal = VDCTRL2_GET_HSYNC_PERIOD(vdctrl2);
+ hsync_len = (vdctrl2 >> devdata->hs_wdth_shift) & devdata->hs_wdth_mask;
+ vsync_len = VDCTRL0_GET_VSYNC_PULSE_WIDTH(vdctrl0);
+
+ vdctrl3 = readl(mxsfb->base + LCDC_VDCTRL3);
+ mode->hsync_start = mode->htotal - GET_HOR_WAIT_CNT(vdctrl3);
+ mode->hsync_end = mode->hsync_start + hsync_len;
+ mode->vsync_start = mode->vtotal - GET_VERT_WAIT_CNT(vdctrl3);
+ mode->vsync_end = mode->vsync_start + vsync_len;
+
+ if (!mode->hdisplay || !mode->vdisplay ||
+ mode->hsync_start < mode->hdisplay ||
+ mode->vsync_start < mode->vdisplay)
+ return -EINVAL;
+
+ mode->clock = DIV_ROUND_CLOSEST(clk_get_rate(mxsfb->clk), 1000);
+
+ /* An active low sync signal can't be told from an unspecified one */
+ if (vdctrl0 & VDCTRL0_HSYNC_ACT_HIGH)
+ mode->flags |= DRM_MODE_FLAG_PHSYNC;
+ if (vdctrl0 & VDCTRL0_VSYNC_ACT_HIGH)
+ mode->flags |= DRM_MODE_FLAG_PVSYNC;
+
+ mode->type |= DRM_MODE_TYPE_DRIVER;
+ drm_mode_set_name(mode);
+ drm_mode_set_crtcinfo(mode, 0);
+
+ return 0;
+}
+
+static int mxsfb_crtc_readout_state(struct drm_crtc *crtc,
+ struct drm_atomic_sro_state *state,
+ struct drm_crtc_state *crtc_state)
+{
+ struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(crtc->dev);
+ struct drm_display_mode mode = {};
+ int ret = 0;
+
+ mxsfb_hw_get(mxsfb);
+
+ if (!mxsfb_is_running(mxsfb))
+ goto out;
+
+ ret = mxsfb_readout_mode(mxsfb, &mode);
+ if (ret)
+ goto out;
+
+ ret = drm_atomic_set_mode_for_crtc(crtc_state, &mode);
+ if (ret)
+ goto out;
+
+ drm_mode_copy(&crtc_state->adjusted_mode, &mode);
+ crtc_state->active = true;
+
+out:
+ mxsfb_hw_put(mxsfb);
+ return ret;
+}
+
+static void mxsfb_crtc_install_state(struct drm_crtc *crtc,
+ struct drm_crtc_state *crtc_state)
+{
+ struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(crtc->dev);
+
+ if (!crtc_state->active)
+ return;
+
+ /* Take the references mxsfb_crtc_atomic_enable() would have taken */
+ mxsfb_hw_get(mxsfb);
+ if (mxsfb->clk_disp_axi)
+ clk_prepare_enable(mxsfb->clk_disp_axi);
+ clk_prepare_enable(mxsfb->clk);
+
+ drm_crtc_vblank_on(crtc);
+}
+
static int mxsfb_crtc_enable_vblank(struct drm_crtc *crtc)
{
struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(crtc->dev);
@@ -535,6 +677,9 @@ static const struct drm_crtc_funcs mxsfb_crtc_funcs = {
.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
.enable_vblank = mxsfb_crtc_enable_vblank,
.disable_vblank = mxsfb_crtc_disable_vblank,
+ .atomic_sro_readout_state = mxsfb_crtc_readout_state,
+ .atomic_sro_install_state = mxsfb_crtc_install_state,
+ .atomic_sro_compare_state = drm_atomic_helper_crtc_compare_state,
};
static const struct drm_crtc_funcs mxsfb_crtc_with_crc_funcs = {
@@ -546,6 +691,9 @@ static const struct drm_crtc_funcs mxsfb_crtc_with_crc_funcs = {
.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
.enable_vblank = mxsfb_crtc_enable_vblank,
.disable_vblank = mxsfb_crtc_disable_vblank,
+ .atomic_sro_readout_state = mxsfb_crtc_readout_state,
+ .atomic_sro_install_state = mxsfb_crtc_install_state,
+ .atomic_sro_compare_state = drm_atomic_helper_crtc_compare_state,
.set_crc_source = mxsfb_crtc_set_crc_source,
.verify_crc_source = mxsfb_crtc_verify_crc_source,
};
@@ -554,8 +702,17 @@ static const struct drm_crtc_funcs mxsfb_crtc_with_crc_funcs = {
* Encoder
*/
+static struct drm_crtc *
+mxsfb_encoder_get_current_crtc(struct drm_encoder *encoder)
+{
+ struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(encoder->dev);
+
+ return &mxsfb->crtc;
+}
+
static const struct drm_encoder_funcs mxsfb_encoder_funcs = {
.destroy = drm_encoder_cleanup,
+ .atomic_sro_get_current_crtc = mxsfb_encoder_get_current_crtc,
};
/* -----------------------------------------------------------------------------
@@ -587,7 +744,7 @@ static void mxsfb_plane_primary_atomic_update(struct drm_plane *plane,
plane);
dma_addr_t dma_addr;
- dma_addr = drm_fb_dma_get_gem_addr(new_pstate->fb, new_pstate, 0);
+ dma_addr = mxsfb_plane_get_dma_addr(new_pstate);
if (dma_addr)
writel(dma_addr, mxsfb->base + mxsfb->devdata->next_buf);
}
@@ -603,7 +760,7 @@ static void mxsfb_plane_overlay_atomic_update(struct drm_plane *plane,
dma_addr_t dma_addr;
u32 ctrl;
- dma_addr = drm_fb_dma_get_gem_addr(new_pstate->fb, new_pstate, 0);
+ dma_addr = mxsfb_plane_get_dma_addr(new_pstate);
if (!dma_addr) {
writel(0, mxsfb->base + LCDC_AS_CTRL);
return;
@@ -615,7 +772,7 @@ static void mxsfb_plane_overlay_atomic_update(struct drm_plane *plane,
* is understood, live with the 16 initial invalid pixels on the first
* line and start 64 bytes within the framebuffer.
*/
- dma_addr += 64;
+ dma_addr += MXSFB_AS_BUF_OFFSET;
writel(dma_addr, mxsfb->base + LCDC_AS_NEXT_BUF);
@@ -663,6 +820,182 @@ static void mxsfb_plane_overlay_atomic_disable(struct drm_plane *plane,
writel(0, mxsfb->base + LCDC_AS_CTRL);
}
+static int mxsfb_plane_readout_state(struct drm_plane *plane,
+ struct drm_atomic_sro_state *state,
+ struct drm_plane_state *plane_state,
+ u32 format, dma_addr_t dma_addr)
+{
+ struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(plane->dev);
+ struct drm_crtc *crtc = &mxsfb->crtc;
+ struct drm_crtc_state *crtc_state;
+ struct mxsfb_readout_fb *rfb;
+ struct drm_framebuffer *fb;
+ u32 reg;
+ int ret;
+
+ crtc_state = drm_atomic_sro_get_crtc_state(state, crtc);
+ if (!crtc_state)
+ return -ENODEV;
+
+ rfb = kzalloc_obj(*rfb);
+ if (!rfb)
+ return -ENOMEM;
+
+ /* The planes can be neither scaled nor positioned */
+ reg = readl(mxsfb->base + mxsfb->devdata->transfer_count);
+
+ rfb->dma_addr = dma_addr;
+ fb = &rfb->base;
+ fb->dev = plane->dev;
+ fb->format = drm_format_info(format);
+ fb->width = TRANSFER_COUNT_GET_HCOUNT(reg);
+ fb->height = TRANSFER_COUNT_GET_VCOUNT(reg);
+ fb->pitches[0] = fb->width * fb->format->cpp[0];
+
+ ret = drm_framebuffer_init(plane->dev, fb, &mxsfb_readout_fb_funcs);
+ if (ret) {
+ kfree(rfb);
+ return ret;
+ }
+
+ plane_state->fb = fb;
+ plane_state->crtc = crtc;
+ plane_state->visible = true;
+ plane_state->crtc_w = fb->width;
+ plane_state->crtc_h = fb->height;
+ plane_state->src_w = fb->width << 16;
+ plane_state->src_h = fb->height << 16;
+ plane_state->src.x2 = plane_state->src_w;
+ plane_state->src.y2 = plane_state->src_h;
+ plane_state->dst.x2 = plane_state->crtc_w;
+ plane_state->dst.y2 = plane_state->crtc_h;
+
+ crtc_state->plane_mask |= drm_plane_mask(plane);
+
+ return 0;
+}
+
+static int
+mxsfb_plane_primary_readout_state(struct drm_plane *plane,
+ struct drm_atomic_sro_state *state,
+ struct drm_plane_state *plane_state)
+{
+ struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(plane->dev);
+ u32 ctrl, ctrl1, format;
+ dma_addr_t dma_addr;
+ int ret = 0;
+
+ mxsfb_hw_get(mxsfb);
+
+ if (!mxsfb_is_running(mxsfb))
+ goto out;
+
+ ctrl = readl(mxsfb->base + LCDC_CTRL);
+ ctrl1 = readl(mxsfb->base + LCDC_CTRL1);
+
+ switch (ctrl & CTRL_WORD_LENGTH_MASK) {
+ case CTRL_WORD_LENGTH_16:
+ format = DRM_FORMAT_RGB565;
+ break;
+ case CTRL_WORD_LENGTH_24:
+ /* Packed pixels are not supported */
+ if (CTRL1_GET_BYTE_PACKAGING(ctrl1) == 0x7) {
+ format = DRM_FORMAT_XRGB8888;
+ break;
+ }
+ fallthrough;
+ default:
+ ret = -EINVAL;
+ goto out;
+ }
+
+ dma_addr = readl(mxsfb->base + mxsfb->devdata->next_buf);
+ ret = mxsfb_plane_readout_state(plane, state, plane_state, format,
+ dma_addr);
+
+out:
+ mxsfb_hw_put(mxsfb);
+ return ret;
+}
+
+static int
+mxsfb_plane_overlay_readout_state(struct drm_plane *plane,
+ struct drm_atomic_sro_state *state,
+ struct drm_plane_state *plane_state)
+{
+ struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(plane->dev);
+ dma_addr_t dma_addr;
+ u32 ctrl, format;
+ bool alpha;
+ int ret = 0;
+
+ mxsfb_hw_get(mxsfb);
+
+ if (!mxsfb_is_running(mxsfb))
+ goto out;
+
+ ctrl = readl(mxsfb->base + LCDC_AS_CTRL);
+ if (!(ctrl & AS_CTRL_AS_ENABLE))
+ goto out;
+
+ alpha = (ctrl & AS_CTRL_ALPHA_CTRL_MASK) == AS_CTRL_ALPHA_CTRL_EMBEDDED;
+
+ switch (ctrl & AS_CTRL_FORMAT_MASK) {
+ case AS_CTRL_FORMAT_RGB444:
+ format = DRM_FORMAT_XRGB4444;
+ break;
+ case AS_CTRL_FORMAT_ARGB4444:
+ format = DRM_FORMAT_ARGB4444;
+ break;
+ case AS_CTRL_FORMAT_RGB555:
+ format = DRM_FORMAT_XRGB1555;
+ break;
+ case AS_CTRL_FORMAT_ARGB1555:
+ format = DRM_FORMAT_ARGB1555;
+ break;
+ case AS_CTRL_FORMAT_RGB565:
+ format = DRM_FORMAT_RGB565;
+ break;
+ case AS_CTRL_FORMAT_RGB888:
+ format = DRM_FORMAT_XRGB8888;
+ break;
+ case AS_CTRL_FORMAT_ARGB8888:
+ format = DRM_FORMAT_ARGB8888;
+ break;
+ default:
+ ret = -EINVAL;
+ goto out;
+ }
+
+ if (alpha != drm_format_info(format)->has_alpha) {
+ ret = -EINVAL;
+ goto out;
+ }
+
+ dma_addr = readl(mxsfb->base + LCDC_AS_NEXT_BUF) - MXSFB_AS_BUF_OFFSET;
+ ret = mxsfb_plane_readout_state(plane, state, plane_state, format,
+ dma_addr);
+
+out:
+ mxsfb_hw_put(mxsfb);
+ return ret;
+}
+
+static bool mxsfb_plane_compare_state(struct drm_plane *plane,
+ struct drm_printer *p,
+ struct drm_plane_state *expected,
+ struct drm_plane_state *actual)
+{
+ struct drm_crtc *crtc = expected->crtc;
+
+ /* The planes can't be read out while the controller is stopped */
+ if (crtc && !crtc->state->active && !actual->fb)
+ return true;
+
+ return drm_atomic_helper_plane_compare_state(plane, p, expected,
+ actual);
+}
+
static bool mxsfb_format_mod_supported(struct drm_plane *plane,
uint32_t format,
uint64_t modifier)
@@ -681,7 +1014,19 @@ static const struct drm_plane_helper_funcs mxsfb_plane_overlay_helper_funcs = {
.atomic_disable = mxsfb_plane_overlay_atomic_disable,
};
-static const struct drm_plane_funcs mxsfb_plane_funcs = {
+static const struct drm_plane_funcs mxsfb_plane_primary_funcs = {
+ .format_mod_supported = mxsfb_format_mod_supported,
+ .update_plane = drm_atomic_helper_update_plane,
+ .disable_plane = drm_atomic_helper_disable_plane,
+ .destroy = drm_plane_cleanup,
+ .atomic_create_state = drm_atomic_helper_plane_create_state,
+ .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
+ .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
+ .atomic_sro_readout_state = mxsfb_plane_primary_readout_state,
+ .atomic_sro_compare_state = mxsfb_plane_compare_state,
+};
+
+static const struct drm_plane_funcs mxsfb_plane_overlay_funcs = {
.format_mod_supported = mxsfb_format_mod_supported,
.update_plane = drm_atomic_helper_update_plane,
.disable_plane = drm_atomic_helper_disable_plane,
@@ -689,6 +1034,8 @@ static const struct drm_plane_funcs mxsfb_plane_funcs = {
.atomic_create_state = drm_atomic_helper_plane_create_state,
.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
+ .atomic_sro_readout_state = mxsfb_plane_overlay_readout_state,
+ .atomic_sro_compare_state = mxsfb_plane_compare_state,
};
static const uint32_t mxsfb_primary_plane_formats[] = {
@@ -724,7 +1071,7 @@ int mxsfb_kms_init(struct mxsfb_drm_private *mxsfb)
drm_plane_helper_add(&mxsfb->planes.primary,
&mxsfb_plane_primary_helper_funcs);
ret = drm_universal_plane_init(mxsfb->drm, &mxsfb->planes.primary, 1,
- &mxsfb_plane_funcs,
+ &mxsfb_plane_primary_funcs,
mxsfb_primary_plane_formats,
ARRAY_SIZE(mxsfb_primary_plane_formats),
mxsfb_modifiers, DRM_PLANE_TYPE_PRIMARY,
@@ -737,7 +1084,7 @@ int mxsfb_kms_init(struct mxsfb_drm_private *mxsfb)
&mxsfb_plane_overlay_helper_funcs);
ret = drm_universal_plane_init(mxsfb->drm,
&mxsfb->planes.overlay, 1,
- &mxsfb_plane_funcs,
+ &mxsfb_plane_overlay_funcs,
mxsfb_overlay_plane_formats,
ARRAY_SIZE(mxsfb_overlay_plane_formats),
mxsfb_modifiers, DRM_PLANE_TYPE_OVERLAY,
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_regs.h b/drivers/gpu/drm/mxsfb/mxsfb_regs.h
index cf813a1da1d7..cfbd13a64388 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_regs.h
+++ b/drivers/gpu/drm/mxsfb/mxsfb_regs.h
@@ -50,6 +50,7 @@
#define CTRL_WORD_LENGTH_8 (1 << 8)
#define CTRL_WORD_LENGTH_18 (2 << 8)
#define CTRL_WORD_LENGTH_24 (3 << 8)
+#define CTRL_WORD_LENGTH_MASK (0x3 << 8)
#define CTRL_MASTER BIT(5)
#define CTRL_DF16 BIT(3)
#define CTRL_DF18 BIT(2)
@@ -115,11 +116,13 @@
#define AS_CTRL_FORMAT_ARGB1555 (0x8 << 4)
#define AS_CTRL_FORMAT_RGB888 (0x4 << 4)
#define AS_CTRL_FORMAT_ARGB8888 (0x0 << 4)
+#define AS_CTRL_FORMAT_MASK (0xf << 4)
#define AS_CTRL_ENABLE_COLORKEY BIT(3)
#define AS_CTRL_ALPHA_CTRL_ROP (3 << 1)
#define AS_CTRL_ALPHA_CTRL_MULTIPLY (2 << 1)
#define AS_CTRL_ALPHA_CTRL_OVERRIDE (1 << 1)
#define AS_CTRL_ALPHA_CTRL_EMBEDDED (0 << 1)
+#define AS_CTRL_ALPHA_CTRL_MASK (3 << 1)
#define AS_CTRL_AS_ENABLE BIT(0)
#define MXSFB_MIN_XRES 120
--
2.43.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [RFC PATCH 7/8] drm/bridge: samsung-dsim: Implement hw state readout
2026-11-22 15:30 [RFC PATCH 0/8] drm: State readout for the i.MX8MN display pipeline Dario Binacchi
` (5 preceding siblings ...)
2026-11-22 15:30 ` [RFC PATCH 6/8] drm/mxsfb: Implement hw state readout Dario Binacchi
@ 2026-11-22 15:30 ` Dario Binacchi
2026-11-22 15:30 ` [RFC PATCH 8/8] drm/panel: synaptics-r63353: Support " Dario Binacchi
7 siblings, 0 replies; 9+ messages in thread
From: Dario Binacchi @ 2026-11-22 15:30 UTC (permalink / raw)
To: Maxime Ripard
Cc: michael, linux-amarula, Dario Binacchi, Andrzej Hajda,
David Airlie, Inki Dae, Jagan Teki, Jernej Skrabec,
Jonas Karlman, Laurent Pinchart, Luca Ceresoli,
Maarten Lankhorst, Marek Szyprowski, Neil Armstrong, Robert Foss,
Simona Vetter, Thomas Zimmermann, dri-devel, linux-kernel
Read out the state of the bridge from the hardware, so that a video
stream left running by the bootloader is taken over without
initializing the bridge again.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
drivers/gpu/drm/bridge/samsung-dsim.c | 125 +++++++++++++++++++++++---
1 file changed, 112 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c
index 480e568dd2c9..2eba8f482d0c 100644
--- a/drivers/gpu/drm/bridge/samsung-dsim.c
+++ b/drivers/gpu/drm/bridge/samsung-dsim.c
@@ -20,11 +20,15 @@
#include <linux/of.h>
#include <linux/phy/phy.h>
#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
#include <linux/units.h>
#include <video/mipi_display.h>
#include <drm/bridge/samsung-dsim.h>
+#include <drm/drm_atomic_state_readout.h>
+#include <drm/drm_atomic_state_readout_helper.h>
+#include <drm/drm_connector.h>
#include <drm/drm_print.h>
/* returns true iff both arguments logically differs */
@@ -1562,6 +1566,17 @@ static int samsung_dsim_transfer(struct samsung_dsim *dsi,
return xfer->result;
}
+static void samsung_dsim_unmask_irqs(struct samsung_dsim *dsi)
+{
+ unsigned long mask = ~(DSIM_INT_RX_DONE |
+ DSIM_INT_SFR_FIFO_EMPTY |
+ DSIM_INT_SFR_HDR_FIFO_EMPTY |
+ DSIM_INT_RX_ECC_ERR |
+ DSIM_INT_SW_RST_RELEASE);
+
+ samsung_dsim_write(dsi, DSIM_INTMSK_REG, mask);
+}
+
static irqreturn_t samsung_dsim_irq(int irq, void *dev_id)
{
struct samsung_dsim *dsi = dev_id;
@@ -1578,12 +1593,7 @@ static irqreturn_t samsung_dsim_irq(int irq, void *dev_id)
samsung_dsim_write(dsi, DSIM_INTSRC_REG, status);
if (status & DSIM_INT_SW_RST_RELEASE) {
- unsigned long mask = ~(DSIM_INT_RX_DONE |
- DSIM_INT_SFR_FIFO_EMPTY |
- DSIM_INT_SFR_HDR_FIFO_EMPTY |
- DSIM_INT_RX_ECC_ERR |
- DSIM_INT_SW_RST_RELEASE);
- samsung_dsim_write(dsi, DSIM_INTMSK_REG, mask);
+ samsung_dsim_unmask_irqs(dsi);
complete(&dsi->completed);
return IRQ_HANDLED;
}
@@ -1758,14 +1768,9 @@ samsung_dsim_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
return input_fmts;
}
-static int samsung_dsim_atomic_check(struct drm_bridge *bridge,
- struct drm_bridge_state *bridge_state,
- struct drm_crtc_state *crtc_state,
- struct drm_connector_state *conn_state)
+static void samsung_dsim_fixup_mode(struct samsung_dsim *dsi,
+ struct drm_display_mode *adjusted_mode)
{
- struct samsung_dsim *dsi = bridge_to_dsi(bridge);
- struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode;
-
/*
* The i.MX8M Mini/Nano glue logic between LCDIF and DSIM
* inverts HS/VS/DE sync signals polarity, therefore, while
@@ -1808,6 +1813,16 @@ static int samsung_dsim_atomic_check(struct drm_bridge *bridge,
adjusted_mode->htotal += remainder;
}
}
+}
+
+static int samsung_dsim_atomic_check(struct drm_bridge *bridge,
+ struct drm_bridge_state *bridge_state,
+ struct drm_crtc_state *crtc_state,
+ struct drm_connector_state *conn_state)
+{
+ struct samsung_dsim *dsi = bridge_to_dsi(bridge);
+
+ samsung_dsim_fixup_mode(dsi, &crtc_state->adjusted_mode);
return 0;
}
@@ -1831,6 +1846,87 @@ static int samsung_dsim_attach(struct drm_bridge *bridge,
flags);
}
+static bool samsung_dsim_hw_is_running(struct samsung_dsim *dsi)
+{
+ const struct samsung_dsim_driver_data *driver_data = dsi->driver_data;
+ u32 reg;
+
+ if (!(samsung_dsim_read(dsi, DSIM_PLLCTRL_REG) & DSIM_PLL_EN))
+ return false;
+
+ if (driver_data->has_legacy_status_reg)
+ reg = samsung_dsim_read(dsi, DSIM_STATUS_REG);
+ else
+ reg = samsung_dsim_read(dsi, DSIM_LINK_STATUS_REG);
+
+ if (!(reg & BIT(driver_data->pll_stable_bit)))
+ return false;
+
+ return samsung_dsim_read(dsi, DSIM_MDRESOL_REG) & DSIM_MAIN_STAND_BY;
+}
+
+static int samsung_dsim_readout_state(struct drm_bridge *bridge,
+ struct drm_atomic_sro_state *state,
+ struct drm_bridge_state *bridge_state,
+ struct drm_crtc_state *crtc_state,
+ struct drm_connector_state *conn_state)
+{
+ struct samsung_dsim *dsi = bridge_to_dsi(bridge);
+ struct drm_display_info *info = &conn_state->connector->display_info;
+ u32 format = MEDIA_BUS_FMT_FIXED;
+ bool running;
+ int ret;
+
+ ret = pm_runtime_resume_and_get(dsi->dev);
+ if (ret < 0)
+ return ret;
+
+ running = samsung_dsim_hw_is_running(dsi);
+ pm_runtime_put(dsi->dev);
+
+ /* The pipeline is active but the video stream is not */
+ if (!running)
+ return -EINVAL;
+
+ /* Rebuild the bus configuration the atomic helpers negotiate */
+ if (info->num_bus_formats)
+ format = info->bus_formats[0];
+
+ bridge_state->output_bus_cfg.format = format;
+ bridge_state->output_bus_cfg.flags = info->bus_flags;
+
+ if (!samsung_dsim_pixel_output_fmt_supported(format))
+ format = MEDIA_BUS_FMT_RGB888_1X24;
+
+ bridge_state->input_bus_cfg.format = format;
+ bridge_state->input_bus_cfg.flags = info->bus_flags;
+
+ /* The mode fixups done in atomic_check can't be read back */
+ samsung_dsim_fixup_mode(dsi, &crtc_state->adjusted_mode);
+
+ return 0;
+}
+
+static void samsung_dsim_install_state(struct drm_bridge *bridge,
+ struct drm_bridge_state *bridge_state)
+{
+ struct samsung_dsim *dsi = bridge_to_dsi(bridge);
+
+ /* Take the reference samsung_dsim_atomic_pre_enable() would have */
+ if (pm_runtime_resume_and_get(dsi->dev) < 0) {
+ dev_err(dsi->dev, "failed to enable DSI device.\n");
+ return;
+ }
+
+ samsung_dsim_write(dsi, DSIM_INTSRC_REG,
+ samsung_dsim_read(dsi, DSIM_INTSRC_REG));
+ samsung_dsim_unmask_irqs(dsi);
+ samsung_dsim_enable_irq(dsi);
+
+ dsi->state |= DSIM_STATE_ENABLED | DSIM_STATE_INITIALIZED |
+ DSIM_STATE_VIDOUT_AVAILABLE;
+}
+
static const struct drm_bridge_funcs samsung_dsim_bridge_funcs = {
.atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
.atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
@@ -1843,6 +1939,9 @@ static const struct drm_bridge_funcs samsung_dsim_bridge_funcs = {
.atomic_post_disable = samsung_dsim_atomic_post_disable,
.mode_set = samsung_dsim_mode_set,
.attach = samsung_dsim_attach,
+ .atomic_sro_readout_state = samsung_dsim_readout_state,
+ .atomic_sro_install_state = samsung_dsim_install_state,
+ .atomic_sro_compare_state = drm_atomic_helper_bridge_compare_state,
};
static irqreturn_t samsung_dsim_te_irq_handler(int irq, void *dev_id)
--
2.43.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [RFC PATCH 8/8] drm/panel: synaptics-r63353: Support hw state readout
2026-11-22 15:30 [RFC PATCH 0/8] drm: State readout for the i.MX8MN display pipeline Dario Binacchi
` (6 preceding siblings ...)
2026-11-22 15:30 ` [RFC PATCH 7/8] drm/bridge: samsung-dsim: " Dario Binacchi
@ 2026-11-22 15:30 ` Dario Binacchi
7 siblings, 0 replies; 9+ messages in thread
From: Dario Binacchi @ 2026-11-22 15:30 UTC (permalink / raw)
To: Maxime Ripard
Cc: michael, linux-amarula, Dario Binacchi, David Airlie,
Jessica Zhang, Maarten Lankhorst, Neil Armstrong, Simona Vetter,
Thomas Zimmermann, dri-devel, linux-kernel
Take over a panel left enabled by the bootloader without turning it
off. The reset line is no longer asserted at probe, since that would
turn the panel off, but when the panel is powered on.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
.../gpu/drm/panel/panel-synaptics-r63353.c | 33 ++++++++++++++++++-
1 file changed, 32 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/panel/panel-synaptics-r63353.c b/drivers/gpu/drm/panel/panel-synaptics-r63353.c
index 73447d7b15d3..e1d84eca62c8 100644
--- a/drivers/gpu/drm/panel/panel-synaptics-r63353.c
+++ b/drivers/gpu/drm/panel/panel-synaptics-r63353.c
@@ -72,6 +72,13 @@ static int r63353_panel_power_on(struct r63353_panel *rpanel)
struct device *dev = &dsi->dev;
int ret;
+ /* The bootloader may have left the panel out of reset */
+ ret = gpiod_direction_output(rpanel->reset_gpio, 0);
+ if (ret) {
+ dev_err(dev, "Failed to assert RESET GPIO (%d)\n", ret);
+ return ret;
+ }
+
ret = regulator_enable(rpanel->avdd);
if (ret) {
dev_err(dev, "Failed to enable avdd regulator (%d)\n", ret);
@@ -181,6 +188,28 @@ static int r63353_panel_unprepare(struct drm_panel *panel)
return 0;
}
+static int r63353_panel_sro_install(struct drm_panel *panel)
+{
+ struct r63353_panel *rpanel = to_r63353_panel(panel);
+ int ret;
+
+ /* A panel held in reset can't be displaying anything */
+ if (!gpiod_get_value_cansleep(rpanel->reset_gpio))
+ return -ENODEV;
+
+ ret = regulator_enable(rpanel->avdd);
+ if (ret)
+ return ret;
+
+ ret = regulator_enable(rpanel->dvdd);
+ if (ret) {
+ regulator_disable(rpanel->avdd);
+ return ret;
+ }
+
+ return 0;
+}
+
static const struct drm_display_mode sharp_ls068b3sx02_timing = {
.clock = 70000,
.hdisplay = 640,
@@ -221,6 +250,7 @@ static const struct drm_panel_funcs r63353_panel_funcs = {
.prepare = r63353_panel_prepare,
.unprepare = r63353_panel_unprepare,
.get_modes = r63353_panel_get_modes,
+ .sro_install = r63353_panel_sro_install,
};
static int r63353_panel_probe(struct mipi_dsi_device *dsi)
@@ -254,7 +284,8 @@ static int r63353_panel_probe(struct mipi_dsi_device *dsi)
if (IS_ERR(panel->avdd))
return PTR_ERR(panel->avdd);
- panel->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW);
+ /* The line is driven when the panel is powered on */
+ panel->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_ASIS);
if (IS_ERR(panel->reset_gpio)) {
dev_err(dev, "failed to get RESET GPIO\n");
return PTR_ERR(panel->reset_gpio);
--
2.43.0
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2026-11-22 15:31 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [RFC PATCH 5/8] drm/mxsfb: Stop the controller in hw_reset Dario Binacchi
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
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®