From: Jason-JH.Lin <jason-jh.lin@mediatek.com>
To: Chun-Kuang Hu <chunkuang.hu@kernel.org>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>,
Eugen Hristev <eugen.hristev@collabora.com>
Cc: "Jason-JH . Lin" <jason-jh.lin@mediatek.com>,
Singo Chang <singo.chang@mediatek.com>,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
Project_Global_Chrome_Upstream_Group@mediatek.com,
Jason-ch Chen <jason-ch.chen@mediatek.com>,
Nancy Lin <nancy.lin@mediatek.com>,
Johnson Wang <johnson.wang@mediatek.com>,
Shawn Sung <shawn.sung@mediatek.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
linux-mediatek@lists.infradead.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v8 3/8] drm/mediatek: Fix using wrong drm private data to bind mediatek-drm
Date: Wed, 2 Aug 2023 22:47:57 +0800 [thread overview]
Message-ID: <20230802144802.751-4-jason-jh.lin@mediatek.com> (raw)
In-Reply-To: <20230802144802.751-1-jason-jh.lin@mediatek.com>
In mtk_drm_kms_init(), each element in all_drm_priv should has one
display path private data only, such as:
all_drm_priv[CRTC_MAIN] should has main_path data only
all_drm_priv[CRTC_EXT] should has ext_path data only
all_drm_priv[CRTC_THIRD] should has third_path data only
So we need to add the length checking for each display path before
assigning their drm private data into all_drm_priv array.
Fixes: 1ef7ed48356c ("drm/mediatek: Modify mediatek-drm for mt8195 multi mmsys support")
Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: CK Hu <ck.hu@mediatek.com>
---
drivers/gpu/drm/mediatek/mtk_drm_drv.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index 89a38561ba27..c12886f31e54 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -351,6 +351,7 @@ static bool mtk_drm_get_all_drm_priv(struct device *dev)
{
struct mtk_drm_private *drm_priv = dev_get_drvdata(dev);
struct mtk_drm_private *all_drm_priv[MAX_CRTC];
+ struct mtk_drm_private *temp_drm_priv;
struct device_node *phandle = dev->parent->of_node;
const struct of_device_id *of_id;
struct device_node *node;
@@ -373,9 +374,18 @@ static bool mtk_drm_get_all_drm_priv(struct device *dev)
if (!drm_dev || !dev_get_drvdata(drm_dev))
continue;
- all_drm_priv[cnt] = dev_get_drvdata(drm_dev);
- if (all_drm_priv[cnt] && all_drm_priv[cnt]->mtk_drm_bound)
- cnt++;
+ temp_drm_priv = dev_get_drvdata(drm_dev);
+ if (temp_drm_priv) {
+ if (temp_drm_priv->mtk_drm_bound)
+ cnt++;
+
+ if (temp_drm_priv->data->main_len)
+ all_drm_priv[CRTC_MAIN] = temp_drm_priv;
+ else if (temp_drm_priv->data->ext_len)
+ all_drm_priv[CRTC_EXT] = temp_drm_priv;
+ else if (temp_drm_priv->data->third_len)
+ all_drm_priv[CRTC_THIRD] = temp_drm_priv;
+ }
}
if (drm_priv->data->mmsys_dev_num == cnt) {
--
2.18.0
next prev parent reply other threads:[~2023-08-02 14:48 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-02 14:47 [PATCH v8 0/8] Add dynamic connector selection mechanism Jason-JH.Lin
2023-08-02 14:47 ` [PATCH v8 1/8] drm/mediatek: Add mmsys_dev_num to mt8188 vdosys0 driver data Jason-JH.Lin
2023-08-02 14:47 ` [PATCH v8 2/8] drm/mediatevk: Add crtc path enum for all_drm_priv array Jason-JH.Lin
2023-08-03 13:18 ` Eugen Hristev
2023-08-05 7:27 ` Jason-JH Lin (林睿祥)
2023-08-02 14:47 ` Jason-JH.Lin [this message]
2023-08-03 13:22 ` [PATCH v8 3/8] drm/mediatek: Fix using wrong drm private data to bind mediatek-drm Eugen Hristev
2023-08-05 8:05 ` Jason-JH Lin (林睿祥)
2023-08-02 14:47 ` [PATCH v8 4/8] drm/mediatek: Add encoder_index function to mtk_ddp_comp_funcs Jason-JH.Lin
2023-08-03 13:27 ` Eugen Hristev
2023-08-05 7:40 ` Jason-JH Lin (林睿祥)
2023-08-02 14:47 ` [PATCH v8 5/8] drm/mediatek: dpi: Support dynamic connector selection Jason-JH.Lin
2023-08-02 14:48 ` [PATCH v8 6/8] drm/mediatek: Add ability to support " Jason-JH.Lin
2023-08-02 14:48 ` [PATCH v8 7/8] drm/mediatek: dsi: Support " Jason-JH.Lin
2023-08-02 14:48 ` [PATCH v8 8/8] drm/mediatek: Support DSI on MT8188 VDOSYS0 Jason-JH.Lin
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=20230802144802.751-4-jason-jh.lin@mediatek.com \
--to=jason-jh.lin@mediatek.com \
--cc=Project_Global_Chrome_Upstream_Group@mediatek.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=chunkuang.hu@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=eugen.hristev@collabora.com \
--cc=jason-ch.chen@mediatek.com \
--cc=johnson.wang@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=nancy.lin@mediatek.com \
--cc=shawn.sung@mediatek.com \
--cc=singo.chang@mediatek.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