From: Akhil P Oommen <akhilpo@oss.qualcomm.com>
To: Rob Clark <robin.clark@oss.qualcomm.com>,
Sean Paul <sean@poorly.run>,
Konrad Dybcio <konradybcio@kernel.org>,
Dmitry Baryshkov <lumag@kernel.org>,
Abhinav Kumar <abhinav.kumar@linux.dev>,
Jessica Zhang <jesszhan0024@gmail.com>,
Marijn Suijten <marijn.suijten@somainline.org>,
David Airlie <airlied@gmail.com>, Simona Vetter <simona@ffwll.ch>,
Neil Armstrong <neil.armstrong@linaro.org>,
Ulf Hansson <ulfh@kernel.org>
Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org,
freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Akisaira <akisaira@outlook.com>,
Vladyslav Tymoshchuk <tvlad744@gmail.com>,
Val Packett <val@packett.cool>,
Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>,
Akhil P Oommen <akhilpo@oss.qualcomm.com>
Subject: [PATCH v2 3/8] drm/msm: Keep DRM private data separate from GPU drvdata
Date: Fri, 30 Oct 2026 22:39:24 +0530 [thread overview]
Message-ID: <20261030-gmu-sync-state-fix-v2-3-89d3082d97af@oss.qualcomm.com> (raw)
In-Reply-To: <20261030-gmu-sync-state-fix-v2-0-89d3082d97af@oss.qualcomm.com>
In separate GPU/KMS mode, the GPU device is also the DRM component
master. msm_drv_probe() stores priv in its drvdata, but msm_gpu_init()
overwrites it with &gpu->adreno_smmu. So, it is better to avoid using
drm priv data in the master's dev->drvdata.
As an alternative, store priv in a devres entry of the drm master and
retrieve it from there during component bind. Update all component
drivers to use the new helpers.
Signed-off-by: Akhil P Oommen <akhilpo@oss.qualcomm.com>
---
drivers/gpu/drm/msm/adreno/adreno_device.c | 6 +++---
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 6 ++----
drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 6 ++----
drivers/gpu/drm/msm/dp/dp_display.c | 4 ++--
drivers/gpu/drm/msm/dsi/dsi.c | 4 ++--
drivers/gpu/drm/msm/hdmi/hdmi.c | 4 ++--
drivers/gpu/drm/msm/msm_drv.c | 24 +++++++++++++++++-------
drivers/gpu/drm/msm/msm_drv.h | 2 ++
drivers/gpu/drm/msm/msm_kms.c | 17 +++++++----------
9 files changed, 39 insertions(+), 34 deletions(-)
diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c
index 1798bb12805a..cdf26b38b904 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_device.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_device.c
@@ -209,10 +209,10 @@ bool adreno_has_gpu(struct device_node *node)
static int adreno_bind(struct device *dev, struct device *master, void *data)
{
+ struct msm_drm_private *priv = msm_drm_get_priv(master);
static struct adreno_platform_config config = {};
- const struct adreno_info *info;
- struct msm_drm_private *priv = dev_get_drvdata(master);
struct drm_device *drm = priv->dev;
+ const struct adreno_info *info;
struct msm_gpu *gpu;
int ret;
@@ -254,7 +254,7 @@ static int adreno_system_suspend(struct device *dev);
static void adreno_unbind(struct device *dev, struct device *master,
void *data)
{
- struct msm_drm_private *priv = dev_get_drvdata(master);
+ struct msm_drm_private *priv = msm_drm_get_priv(master);
struct msm_gpu *gpu = dev_to_gpu(dev);
if (pm_runtime_enabled(dev))
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index da3556eb6ecc..c044d3c9737a 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -1434,8 +1434,7 @@ static void dpu_dev_remove(struct platform_device *pdev)
static int __maybe_unused dpu_runtime_suspend(struct device *dev)
{
int i;
- struct platform_device *pdev = to_platform_device(dev);
- struct msm_drm_private *priv = platform_get_drvdata(pdev);
+ struct msm_drm_private *priv = msm_drm_get_priv(dev);
struct dpu_kms *dpu_kms = to_dpu_kms(priv->kms);
clk_bulk_disable_unprepare(dpu_kms->num_clocks, dpu_kms->clocks);
@@ -1449,8 +1448,7 @@ static int __maybe_unused dpu_runtime_suspend(struct device *dev)
static int __maybe_unused dpu_runtime_resume(struct device *dev)
{
int rc = -1;
- struct platform_device *pdev = to_platform_device(dev);
- struct msm_drm_private *priv = platform_get_drvdata(pdev);
+ struct msm_drm_private *priv = msm_drm_get_priv(dev);
struct dpu_kms *dpu_kms = to_dpu_kms(priv->kms);
struct drm_encoder *encoder;
struct drm_device *ddev;
diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
index 3934cd060b27..40b4415c0fba 100644
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
@@ -869,8 +869,7 @@ static void mdp5_dev_remove(struct platform_device *pdev)
static __maybe_unused int mdp5_runtime_suspend(struct device *dev)
{
- struct platform_device *pdev = to_platform_device(dev);
- struct msm_drm_private *priv = platform_get_drvdata(pdev);
+ struct msm_drm_private *priv = msm_drm_get_priv(dev);
struct mdp5_kms *mdp5_kms = to_mdp5_kms(to_mdp_kms(priv->kms));
DBG("");
@@ -880,8 +879,7 @@ static __maybe_unused int mdp5_runtime_suspend(struct device *dev)
static __maybe_unused int mdp5_runtime_resume(struct device *dev)
{
- struct platform_device *pdev = to_platform_device(dev);
- struct msm_drm_private *priv = platform_get_drvdata(pdev);
+ struct msm_drm_private *priv = msm_drm_get_priv(dev);
struct mdp5_kms *mdp5_kms = to_mdp5_kms(to_mdp_kms(priv->kms));
DBG("");
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index 9299ce616fdb..40ce87d7d252 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -214,7 +214,7 @@ static int msm_dp_display_bind(struct device *dev, struct device *master,
{
int rc = 0;
struct msm_dp_display_private *dp = dev_get_dp_display_private(dev);
- struct msm_drm_private *priv = dev_get_drvdata(master);
+ struct msm_drm_private *priv = msm_drm_get_priv(master);
struct drm_device *drm = priv->dev;
dp->msm_dp_display.drm_dev = drm;
@@ -237,7 +237,7 @@ static void msm_dp_display_unbind(struct device *dev, struct device *master,
void *data)
{
struct msm_dp_display_private *dp = dev_get_dp_display_private(dev);
- struct msm_drm_private *priv = dev_get_drvdata(master);
+ struct msm_drm_private *priv = msm_drm_get_priv(master);
of_dp_aux_depopulate_bus(dp->aux);
diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c
index c726fc628a08..bc6d470bb191 100644
--- a/drivers/gpu/drm/msm/dsi/dsi.c
+++ b/drivers/gpu/drm/msm/dsi/dsi.c
@@ -119,7 +119,7 @@ static struct msm_dsi *dsi_init(struct platform_device *pdev)
static int dsi_bind(struct device *dev, struct device *master, void *data)
{
- struct msm_drm_private *priv = dev_get_drvdata(master);
+ struct msm_drm_private *priv = msm_drm_get_priv(master);
struct msm_dsi *msm_dsi = dev_get_drvdata(dev);
/*
@@ -146,7 +146,7 @@ static int dsi_bind(struct device *dev, struct device *master, void *data)
static void dsi_unbind(struct device *dev, struct device *master,
void *data)
{
- struct msm_drm_private *priv = dev_get_drvdata(master);
+ struct msm_drm_private *priv = msm_drm_get_priv(master);
struct msm_dsi *msm_dsi = dev_get_drvdata(dev);
msm_dsi_tx_buf_free(msm_dsi->host);
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c
index 474006084633..2ca7693773b2 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
@@ -236,7 +236,7 @@ static const struct hdmi_platform_config hdmi_tx_8974_config = {
static int msm_hdmi_bind(struct device *dev, struct device *master, void *data)
{
- struct msm_drm_private *priv = dev_get_drvdata(master);
+ struct msm_drm_private *priv = msm_drm_get_priv(master);
struct hdmi *hdmi = dev_get_drvdata(dev);
int err;
@@ -251,7 +251,7 @@ static int msm_hdmi_bind(struct device *dev, struct device *master, void *data)
static void msm_hdmi_unbind(struct device *dev, struct device *master,
void *data)
{
- struct msm_drm_private *priv = dev_get_drvdata(master);
+ struct msm_drm_private *priv = msm_drm_get_priv(master);
if (priv->kms->hdmi) {
msm_hdmi_destroy(priv->kms->hdmi);
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 5e8f3ce26b32..e25ef578d2b3 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -137,10 +137,19 @@ bool msm_separate_gpu_kms_components(void)
}
}
+static void msm_drm_priv_release(struct device *dev, void *res)
+{
+ /* The devres core frees the allocation after this callback. */
+}
+
+struct msm_drm_private *msm_drm_get_priv(struct device *dev)
+{
+ return devres_find(dev, msm_drm_priv_release, NULL, NULL);
+}
+
static int msm_drm_uninit(struct device *dev, const struct component_ops *gpu_ops)
{
- struct platform_device *pdev = to_platform_device(dev);
- struct msm_drm_private *priv = platform_get_drvdata(pdev);
+ struct msm_drm_private *priv = msm_drm_get_priv(dev);
struct drm_device *ddev = priv->dev;
/*
@@ -177,7 +186,7 @@ static int msm_drm_uninit(struct device *dev, const struct component_ops *gpu_op
static int msm_drm_init(struct device *dev, const struct drm_driver *drv,
const struct component_ops *gpu_ops)
{
- struct msm_drm_private *priv = dev_get_drvdata(dev);
+ struct msm_drm_private *priv = msm_drm_get_priv(dev);
struct drm_device *ddev;
int ret;
@@ -1137,13 +1146,14 @@ int msm_drv_probe(struct device *master_dev,
struct component_match *match = NULL;
int ret;
- priv = devm_kzalloc(master_dev, sizeof(*priv), GFP_KERNEL);
+ priv = devres_alloc(msm_drm_priv_release, sizeof(*priv), GFP_KERNEL);
if (!priv)
return -ENOMEM;
priv->kms = kms;
priv->kms_init = kms_init;
- dev_set_drvdata(master_dev, priv);
+ /* Register before component binding so priv survives unbind/rebind. */
+ devres_add(master_dev, priv);
/* Add mdp components if we have KMS. */
if (kms_init) {
@@ -1178,11 +1188,11 @@ int msm_gpu_probe(struct platform_device *pdev,
struct msm_drm_private *priv;
int ret;
- priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
+ priv = devres_alloc(msm_drm_priv_release, sizeof(*priv), GFP_KERNEL);
if (!priv)
return -ENOMEM;
- platform_set_drvdata(pdev, priv);
+ devres_add(&pdev->dev, priv);
/* on all devices that I am aware of, iommu's which can map
* any address the cpu can see are used:
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index 2840e8a5052d..107d0efb62ce 100644
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -524,6 +524,8 @@ static inline unsigned long timeout_to_jiffies(const ktime_t *timeout)
extern const struct component_master_ops msm_drm_ops;
+struct msm_drm_private *msm_drm_get_priv(struct device *dev);
+
int msm_kms_pm_prepare(struct device *dev);
void msm_kms_pm_complete(struct device *dev);
diff --git a/drivers/gpu/drm/msm/msm_kms.c b/drivers/gpu/drm/msm/msm_kms.c
index e5d0ea629448..3597dc276579 100644
--- a/drivers/gpu/drm/msm/msm_kms.c
+++ b/drivers/gpu/drm/msm/msm_kms.c
@@ -218,8 +218,7 @@ struct drm_gpuvm *msm_kms_init_vm(struct drm_device *dev, struct device *mdss_de
void msm_drm_kms_unregister(struct device *dev)
{
- struct platform_device *pdev = to_platform_device(dev);
- struct msm_drm_private *priv = platform_get_drvdata(pdev);
+ struct msm_drm_private *priv = msm_drm_get_priv(dev);
struct drm_device *ddev = priv->dev;
drm_atomic_helper_shutdown(ddev);
@@ -227,8 +226,7 @@ void msm_drm_kms_unregister(struct device *dev)
void msm_drm_kms_uninit(struct device *dev)
{
- struct platform_device *pdev = to_platform_device(dev);
- struct msm_drm_private *priv = platform_get_drvdata(pdev);
+ struct msm_drm_private *priv = msm_drm_get_priv(dev);
struct drm_device *ddev = priv->dev;
struct msm_kms *kms = priv->kms;
int i;
@@ -262,7 +260,7 @@ void msm_drm_kms_uninit(struct device *dev)
int msm_drm_kms_init(struct device *dev, const struct drm_driver *drv)
{
- struct msm_drm_private *priv = dev_get_drvdata(dev);
+ struct msm_drm_private *priv = msm_drm_get_priv(dev);
struct drm_device *ddev = priv->dev;
struct msm_kms *kms = priv->kms;
struct drm_crtc *crtc;
@@ -341,7 +339,7 @@ int msm_drm_kms_init(struct device *dev, const struct drm_driver *drv)
int msm_kms_pm_prepare(struct device *dev)
{
- struct msm_drm_private *priv = dev_get_drvdata(dev);
+ struct msm_drm_private *priv = msm_drm_get_priv(dev);
struct drm_device *ddev = priv ? priv->dev : NULL;
if (!priv || !priv->kms)
@@ -352,7 +350,7 @@ int msm_kms_pm_prepare(struct device *dev)
void msm_kms_pm_complete(struct device *dev)
{
- struct msm_drm_private *priv = dev_get_drvdata(dev);
+ struct msm_drm_private *priv = msm_drm_get_priv(dev);
struct drm_device *ddev = priv ? priv->dev : NULL;
if (!priv || !priv->kms)
@@ -363,7 +361,7 @@ void msm_kms_pm_complete(struct device *dev)
void msm_kms_shutdown(struct platform_device *pdev)
{
- struct msm_drm_private *priv = platform_get_drvdata(pdev);
+ struct msm_drm_private *priv = msm_drm_get_priv(&pdev->dev);
struct drm_device *drm = priv ? priv->dev : NULL;
/*
@@ -379,8 +377,7 @@ void msm_kms_shutdown(struct platform_device *pdev)
void msm_drm_kms_post_init(struct device *dev)
{
- struct platform_device *pdev = to_platform_device(dev);
- struct msm_drm_private *priv = platform_get_drvdata(pdev);
+ struct msm_drm_private *priv = msm_drm_get_priv(dev);
struct drm_device *ddev = priv->dev;
drm_kms_helper_poll_init(ddev);
--
2.55.0
next prev parent reply other threads:[~2026-10-30 17:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-30 17:09 [PATCH v2 0/8] drm/msm: Attach a driver to GMU Akhil P Oommen
2026-10-30 17:09 ` [PATCH v2 1/8] drm/msm/adreno: Fix invalid drvdata typecast in adreno_remove() Akhil P Oommen
2026-10-30 17:09 ` [PATCH v2 2/8] drm/msm/adreno/a6xx: Mark cxpd device_link as stateless Akhil P Oommen
2026-10-30 17:09 ` Akhil P Oommen [this message]
2026-10-30 17:09 ` [PATCH v2 4/8] drm/msm/adreno: Simplify adreno_probe() Akhil P Oommen
2026-10-30 17:09 ` [PATCH v2 5/8] drm/msm: Always use component model for standalone GPU Akhil P Oommen
2026-10-30 17:09 ` [PATCH v2 6/8] drm/msm: Attach a driver to the GMU Akhil P Oommen
2026-10-30 17:09 ` [PATCH v2 7/8] drm/msm: Remove dead gpu_ops parameter from msm_drm_init/uninit Akhil P Oommen
2026-10-30 17:09 ` [PATCH v2 8/8] drm/msm: Consolidate msm_gpu_probe into msm_drv_probe Akhil P Oommen
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=20261030-gmu-sync-state-fix-v2-3-89d3082d97af@oss.qualcomm.com \
--to=akhilpo@oss.qualcomm.com \
--cc=abhinav.kumar@linux.dev \
--cc=airlied@gmail.com \
--cc=akisaira@outlook.com \
--cc=dmitry.baryshkov@oss.qualcomm.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=jesszhan0024@gmail.com \
--cc=konradybcio@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lumag@kernel.org \
--cc=marijn.suijten@somainline.org \
--cc=neil.armstrong@linaro.org \
--cc=robin.clark@oss.qualcomm.com \
--cc=sean@poorly.run \
--cc=simona@ffwll.ch \
--cc=tvlad744@gmail.com \
--cc=ulfh@kernel.org \
--cc=val@packett.cool \
/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®