dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v8 0/8] Add dynamic connector selection mechanism
@ 2023-08-02 14:47 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
                   ` (7 more replies)
  0 siblings, 8 replies; 15+ messages in thread
From: Jason-JH.Lin @ 2023-08-02 14:47 UTC (permalink / raw)
  To: Chun-Kuang Hu, AngeloGioacchino Del Regno, Eugen Hristev
  Cc: Jason-JH . Lin, Singo Chang, linux-kernel, dri-devel,
	Project_Global_Chrome_Upstream_Group, Jason-ch Chen, Nancy Lin,
	Johnson Wang, Shawn Sung, Matthias Brugger, linux-mediatek,
	linux-arm-kernel

To support DSI and eDP as main display connector without modifying
mtk-drm driver, we add the dynamic connector selection mechanism.

Change in v8:
1. add mtk_drm_crtc_path enum to replace array index of all_drm_priv.
2. separate add encoder_index function to another patch.
3. separate add dpi and dsi encoder_index function implementation to
   another patch.
4. separate add dsi conn_routes support to another patch.
5. set encoder_index to -1 if comp->dev doesn't not exist and add
   (encoder_index >= 0) checking before assigning conn_routes.
6. move conn_routes statement to the end of mtk_drm_crtc_create.

Change in v7:
1. separate 2 fixes patch from v6.
2. remove unnecessary null checking and variable.
3. move ddp_comp checking to crtc create.

Change in v6:
1. remove max_ddp_comp_nr.

Change in v5:
1. Change conn_routes array to single component enum id.

Change in v4:
1. Change variable naming from conn_route_num to num_conn_routes.
2. Change he encoder_index function return valuew from int to unsigned int.

Change in v3:
1. Change max_num comparison statement to max().

Change in v2:
1. rebase on linux-next: next-20230426
2. Fix alphabetical order and max_num condition check problem.

Change in v1:
1. based on mediatek-drm maintainer's tree / mediatek-drm-next branch:
https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/log/?h=mediatek-drm-next

Jason-JH.Lin (8):
  drm/mediatek: Add mmsys_dev_num to mt8188 vdosys0 driver data
  drm/mediatevk: Add crtc path enum for all_drm_priv array
  drm/mediatek: Fix using wrong drm private data to bind mediatek-drm
  drm/mediatek: Add encoder_index function to mtk_ddp_comp_funcs
  drm/mediatek: dpi: Support dynamic connector selection
  drm/mediatek: Add ability to support dynamic connector selection
  drm/mediatek: dsi: Support dynamic connector selection
  drm/mediatek: Support DSI on MT8188 VDOSYS0

 drivers/gpu/drm/mediatek/mtk_disp_drv.h     |  2 +
 drivers/gpu/drm/mediatek/mtk_dpi.c          |  9 +++
 drivers/gpu/drm/mediatek/mtk_drm_crtc.c     | 81 ++++++++++++++++++++-
 drivers/gpu/drm/mediatek/mtk_drm_crtc.h     |  5 +-
 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 29 +++++++-
 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h |  8 ++
 drivers/gpu/drm/mediatek/mtk_drm_drv.c      | 44 ++++++++---
 drivers/gpu/drm/mediatek/mtk_drm_drv.h      | 15 +++-
 drivers/gpu/drm/mediatek/mtk_dsi.c          |  9 +++
 9 files changed, 188 insertions(+), 14 deletions(-)

-- 
2.18.0


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH v8 1/8] drm/mediatek: Add mmsys_dev_num to mt8188 vdosys0 driver data
  2023-08-02 14:47 [PATCH v8 0/8] Add dynamic connector selection mechanism Jason-JH.Lin
@ 2023-08-02 14:47 ` 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
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 15+ messages in thread
From: Jason-JH.Lin @ 2023-08-02 14:47 UTC (permalink / raw)
  To: Chun-Kuang Hu, AngeloGioacchino Del Regno, Eugen Hristev
  Cc: Jason-JH . Lin, Singo Chang, linux-kernel, dri-devel,
	Project_Global_Chrome_Upstream_Group, Jason-ch Chen, Nancy Lin,
	Johnson Wang, Shawn Sung, Matthias Brugger, linux-mediatek,
	linux-arm-kernel

Add missing mmsys_dev_num to mt8188 vdosys0 driver data.

Fixes: 54b48080278a ("drm/mediatek: Add mediatek-drm of vdosys0 support for mt8188")
Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
Reviewed-by: CK Hu <ck.hu@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
---
 drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index 6dcb4ba2466c..249c9fd6347e 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -287,6 +287,7 @@ static const struct mtk_mmsys_driver_data mt8186_mmsys_driver_data = {
 static const struct mtk_mmsys_driver_data mt8188_vdosys0_driver_data = {
 	.main_path = mt8188_mtk_ddp_main,
 	.main_len = ARRAY_SIZE(mt8188_mtk_ddp_main),
+	.mmsys_dev_num = 1,
 };
 
 static const struct mtk_mmsys_driver_data mt8192_mmsys_driver_data = {
-- 
2.18.0


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH v8 2/8] drm/mediatevk: Add crtc path enum for all_drm_priv array
  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 ` Jason-JH.Lin
  2023-08-03 13:18   ` Eugen Hristev
  2023-08-02 14:47 ` [PATCH v8 3/8] drm/mediatek: Fix using wrong drm private data to bind mediatek-drm Jason-JH.Lin
                   ` (5 subsequent siblings)
  7 siblings, 1 reply; 15+ messages in thread
From: Jason-JH.Lin @ 2023-08-02 14:47 UTC (permalink / raw)
  To: Chun-Kuang Hu, AngeloGioacchino Del Regno, Eugen Hristev
  Cc: Jason-JH . Lin, Singo Chang, linux-kernel, dri-devel,
	Project_Global_Chrome_Upstream_Group, Jason-ch Chen, Nancy Lin,
	Johnson Wang, Shawn Sung, Matthias Brugger, linux-mediatek,
	linux-arm-kernel

Add mtk_drm_crtc_path enum for eatch display path.

Instead of using array index of all_drm_priv in mtk_drm_kms_init(),
mtk_drm_crtc_path enum can make more readable.

Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
---
 drivers/gpu/drm/mediatek/mtk_drm_drv.c | 6 +++---
 drivers/gpu/drm/mediatek/mtk_drm_drv.h | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index 249c9fd6347e..89a38561ba27 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -465,21 +465,21 @@ static int mtk_drm_kms_init(struct drm_device *drm)
 		for (j = 0; j < private->data->mmsys_dev_num; j++) {
 			priv_n = private->all_drm_private[j];
 
-			if (i == 0 && priv_n->data->main_len) {
+			if (i == CRTC_MAIN && priv_n->data->main_len) {
 				ret = mtk_drm_crtc_create(drm, priv_n->data->main_path,
 							  priv_n->data->main_len, j);
 				if (ret)
 					goto err_component_unbind;
 
 				continue;
-			} else if (i == 1 && priv_n->data->ext_len) {
+			} else if (i == CRTC_EXT && priv_n->data->ext_len) {
 				ret = mtk_drm_crtc_create(drm, priv_n->data->ext_path,
 							  priv_n->data->ext_len, j);
 				if (ret)
 					goto err_component_unbind;
 
 				continue;
-			} else if (i == 2 && priv_n->data->third_len) {
+			} else if (i == CRTC_THIRD && priv_n->data->third_len) {
 				ret = mtk_drm_crtc_create(drm, priv_n->data->third_path,
 							  priv_n->data->third_len, j);
 				if (ret)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
index eb2fd45941f0..f4de8bb27685 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
@@ -9,11 +9,17 @@
 #include <linux/io.h>
 #include "mtk_drm_ddp_comp.h"
 
-#define MAX_CRTC	3
 #define MAX_CONNECTOR	2
 #define DDP_COMPONENT_DRM_OVL_ADAPTOR (DDP_COMPONENT_ID_MAX + 1)
 #define DDP_COMPONENT_DRM_ID_MAX (DDP_COMPONENT_DRM_OVL_ADAPTOR + 1)
 
+enum mtk_drm_crtc_path {
+	CRTC_MAIN,
+	CRTC_EXT,
+	CRTC_THIRD,
+	MAX_CRTC,
+};
+
 struct device;
 struct device_node;
 struct drm_crtc;
-- 
2.18.0


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH v8 3/8] drm/mediatek: Fix using wrong drm private data to bind mediatek-drm
  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-02 14:47 ` Jason-JH.Lin
  2023-08-03 13:22   ` Eugen Hristev
  2023-08-02 14:47 ` [PATCH v8 4/8] drm/mediatek: Add encoder_index function to mtk_ddp_comp_funcs Jason-JH.Lin
                   ` (4 subsequent siblings)
  7 siblings, 1 reply; 15+ messages in thread
From: Jason-JH.Lin @ 2023-08-02 14:47 UTC (permalink / raw)
  To: Chun-Kuang Hu, AngeloGioacchino Del Regno, Eugen Hristev
  Cc: Jason-JH . Lin, Singo Chang, linux-kernel, dri-devel,
	Project_Global_Chrome_Upstream_Group, Jason-ch Chen, Nancy Lin,
	Johnson Wang, Shawn Sung, Matthias Brugger, linux-mediatek,
	linux-arm-kernel

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


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH v8 4/8] drm/mediatek: Add encoder_index function to mtk_ddp_comp_funcs
  2023-08-02 14:47 [PATCH v8 0/8] Add dynamic connector selection mechanism Jason-JH.Lin
                   ` (2 preceding siblings ...)
  2023-08-02 14:47 ` [PATCH v8 3/8] drm/mediatek: Fix using wrong drm private data to bind mediatek-drm Jason-JH.Lin
@ 2023-08-02 14:47 ` Jason-JH.Lin
  2023-08-03 13:27   ` Eugen Hristev
  2023-08-02 14:47 ` [PATCH v8 5/8] drm/mediatek: dpi: Support dynamic connector selection Jason-JH.Lin
                   ` (3 subsequent siblings)
  7 siblings, 1 reply; 15+ messages in thread
From: Jason-JH.Lin @ 2023-08-02 14:47 UTC (permalink / raw)
  To: Chun-Kuang Hu, AngeloGioacchino Del Regno, Eugen Hristev
  Cc: Jason-JH . Lin, Singo Chang, linux-kernel, dri-devel,
	Project_Global_Chrome_Upstream_Group, Jason-ch Chen, Nancy Lin,
	Johnson Wang, Shawn Sung, Matthias Brugger, linux-mediatek,
	linux-arm-kernel

1. Add encoder_index function to mtk_ddp_comp_funcs to support dynamic
connector selection for some ddp_comp who has encoder_index.
2. Add mtk_ddp_comp_encoder_index_set function to set encoder_index to
each comp.

Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
---
 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
index febcaeef16a1..8428baca70f4 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
@@ -80,6 +80,7 @@ struct mtk_ddp_comp_funcs {
 	void (*disconnect)(struct device *dev, struct device *mmsys_dev, unsigned int next);
 	void (*add)(struct device *dev, struct mtk_mutex *mutex);
 	void (*remove)(struct device *dev, struct mtk_mutex *mutex);
+	unsigned int (*encoder_index)(struct device *dev);
 };
 
 struct mtk_ddp_comp {
@@ -87,6 +88,7 @@ struct mtk_ddp_comp {
 	int irq;
 	unsigned int id;
 	const struct mtk_ddp_comp_funcs *funcs;
+	unsigned int encoder_index;
 };
 
 static inline int mtk_ddp_comp_clk_enable(struct mtk_ddp_comp *comp)
@@ -275,6 +277,12 @@ static inline bool mtk_ddp_comp_disconnect(struct mtk_ddp_comp *comp, struct dev
 	return false;
 }
 
+static inline void mtk_ddp_comp_encoder_index_set(struct mtk_ddp_comp *comp)
+{
+	if (comp->funcs && comp->funcs->encoder_index)
+		comp->encoder_index = comp->funcs->encoder_index(comp->dev);
+}
+
 int mtk_ddp_comp_get_id(struct device_node *node,
 			enum mtk_ddp_comp_type comp_type);
 unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device *drm,
-- 
2.18.0


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH v8 5/8] drm/mediatek: dpi: Support dynamic connector selection
  2023-08-02 14:47 [PATCH v8 0/8] Add dynamic connector selection mechanism Jason-JH.Lin
                   ` (3 preceding siblings ...)
  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-02 14:47 ` Jason-JH.Lin
  2023-08-02 14:48 ` [PATCH v8 6/8] drm/mediatek: Add ability to support " Jason-JH.Lin
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 15+ messages in thread
From: Jason-JH.Lin @ 2023-08-02 14:47 UTC (permalink / raw)
  To: Chun-Kuang Hu, AngeloGioacchino Del Regno, Eugen Hristev
  Cc: Jason-JH . Lin, Singo Chang, linux-kernel, dri-devel,
	Project_Global_Chrome_Upstream_Group, Jason-ch Chen, Nancy Lin,
	Johnson Wang, Shawn Sung, Matthias Brugger, linux-mediatek,
	linux-arm-kernel

Add implementation of mtk_dpi_encoder_index to mtk_ddp_comp_func
to make mtk_dpi support dynamic connector selection.

Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
---
 drivers/gpu/drm/mediatek/mtk_disp_drv.h     | 1 +
 drivers/gpu/drm/mediatek/mtk_dpi.c          | 9 +++++++++
 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 1 +
 3 files changed, 11 insertions(+)

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
index 2254038519e1..5f07037670e9 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h
+++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
@@ -44,6 +44,7 @@ void mtk_dither_set_common(void __iomem *regs, struct cmdq_client_reg *cmdq_reg,
 
 void mtk_dpi_start(struct device *dev);
 void mtk_dpi_stop(struct device *dev);
+unsigned int mtk_dpi_encoder_index(struct device *dev);
 
 void mtk_dsi_ddp_start(struct device *dev);
 void mtk_dsi_ddp_stop(struct device *dev);
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
index 948a53f1f4b3..3d6b3c228f30 100644
--- a/drivers/gpu/drm/mediatek/mtk_dpi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
@@ -782,6 +782,15 @@ void mtk_dpi_stop(struct device *dev)
 	mtk_dpi_power_off(dpi);
 }
 
+unsigned int mtk_dpi_encoder_index(struct device *dev)
+{
+	struct mtk_dpi *dpi = dev_get_drvdata(dev);
+	unsigned int encoder_index = drm_encoder_index(&dpi->encoder);
+
+	dev_dbg(dev, "encoder index:%d\n", encoder_index);
+	return encoder_index;
+}
+
 static int mtk_dpi_bind(struct device *dev, struct device *master, void *data)
 {
 	struct mtk_dpi *dpi = dev_get_drvdata(dev);
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
index f114da4d36a9..effaaa769b46 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
@@ -304,6 +304,7 @@ static const struct mtk_ddp_comp_funcs ddp_dither = {
 static const struct mtk_ddp_comp_funcs ddp_dpi = {
 	.start = mtk_dpi_start,
 	.stop = mtk_dpi_stop,
+	.encoder_index = mtk_dpi_encoder_index,
 };
 
 static const struct mtk_ddp_comp_funcs ddp_dsc = {
-- 
2.18.0


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH v8 6/8] drm/mediatek: Add ability to support dynamic connector selection
  2023-08-02 14:47 [PATCH v8 0/8] Add dynamic connector selection mechanism Jason-JH.Lin
                   ` (4 preceding siblings ...)
  2023-08-02 14:47 ` [PATCH v8 5/8] drm/mediatek: dpi: Support dynamic connector selection Jason-JH.Lin
@ 2023-08-02 14:48 ` 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
  7 siblings, 0 replies; 15+ messages in thread
From: Jason-JH.Lin @ 2023-08-02 14:48 UTC (permalink / raw)
  To: Chun-Kuang Hu, AngeloGioacchino Del Regno, Eugen Hristev
  Cc: Nathan Lu, Jason-JH . Lin, Singo Chang, linux-kernel, dri-devel,
	Project_Global_Chrome_Upstream_Group, Jason-ch Chen, Nancy Lin,
	Johnson Wang, Shawn Sung, Matthias Brugger, linux-mediatek,
	linux-arm-kernel

1. Move output drm connector from each ddp_path array to connector array.
2. Add dynamic select available connector flow in crtc create and enable.

Signed-off-by: Nancy Lin <nancy.lin@mediatek.com>
Signed-off-by: Nathan Lu <nathan.lu@mediatek.com>
Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
---
 drivers/gpu/drm/mediatek/mtk_drm_crtc.c     | 81 ++++++++++++++++++++-
 drivers/gpu/drm/mediatek/mtk_drm_crtc.h     |  5 +-
 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 27 ++++++-
 drivers/gpu/drm/mediatek/mtk_drm_drv.c      | 20 ++++-
 drivers/gpu/drm/mediatek/mtk_drm_drv.h      |  7 ++
 5 files changed, 133 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index d40142842f85..c57012f9c0c8 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -62,6 +62,8 @@ struct mtk_drm_crtc {
 	struct mtk_mutex		*mutex;
 	unsigned int			ddp_comp_nr;
 	struct mtk_ddp_comp		**ddp_comp;
+	unsigned int			num_conn_routes;
+	const struct mtk_drm_route	*conn_routes;
 
 	/* lock for display hardware access */
 	struct mutex			hw_lock;
@@ -649,6 +651,47 @@ static void mtk_drm_crtc_disable_vblank(struct drm_crtc *crtc)
 	mtk_ddp_comp_disable_vblank(comp);
 }
 
+static void mtk_drm_crtc_update_output(struct drm_crtc *crtc,
+				       struct drm_atomic_state *state)
+{
+	int crtc_index = drm_crtc_index(crtc);
+	int i;
+	struct device *dev;
+	struct drm_crtc_state *crtc_state = state->crtcs[crtc_index].new_state;
+	struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
+	struct mtk_drm_private *priv = crtc->dev->dev_private;
+	unsigned int comp_id;
+	unsigned int encoder_mask = crtc_state->encoder_mask;
+
+	if (!crtc_state->connectors_changed)
+		return;
+
+	if (!mtk_crtc->num_conn_routes)
+		return;
+
+	priv = priv->all_drm_private[crtc_index];
+	dev = priv->dev;
+
+	dev_dbg(dev, "connector change:%d, encoder mask:0x%x for crtc:%d\n",
+		crtc_state->connectors_changed, encoder_mask, crtc_index);
+
+	for (i = 0; i < mtk_crtc->num_conn_routes; i++) {
+		struct mtk_ddp_comp *comp;
+
+		comp_id = mtk_crtc->conn_routes[i].route_ddp;
+		comp = &priv->ddp_comp[comp_id];
+		if (comp->encoder_index >= 0 &&
+		    encoder_mask & BIT(comp->encoder_index)) {
+			mtk_crtc->ddp_comp[mtk_crtc->ddp_comp_nr - 1] = comp;
+			dev_dbg(dev, "Add comp_id: %d at path index %d\n",
+				comp->id, mtk_crtc->ddp_comp_nr - 1);
+			break;
+		}
+	}
+
+	dev_dbg(dev, "Update total comp num:%d", mtk_crtc->ddp_comp_nr);
+}
+
 int mtk_drm_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane,
 			     struct mtk_plane_state *state)
 {
@@ -681,6 +724,8 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
 
 	DRM_DEBUG_DRIVER("%s %d\n", __func__, crtc->base.id);
 
+	mtk_drm_crtc_update_output(crtc, state);
+
 	ret = pm_runtime_resume_and_get(comp->dev);
 	if (ret < 0) {
 		DRM_DEV_ERROR(comp->dev, "Failed to enable power domain: %d\n", ret);
@@ -886,7 +931,8 @@ struct device *mtk_drm_crtc_dma_dev_get(struct drm_crtc *crtc)
 
 int mtk_drm_crtc_create(struct drm_device *drm_dev,
 			const unsigned int *path, unsigned int path_len,
-			int priv_data_index)
+			int priv_data_index, const struct mtk_drm_route *conn_routes,
+			unsigned int num_conn_routes)
 {
 	struct mtk_drm_private *priv = drm_dev->dev_private;
 	struct device *dev = drm_dev->dev;
@@ -1040,5 +1086,38 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
 		init_waitqueue_head(&mtk_crtc->cb_blocking_queue);
 	}
 #endif
+
+	if (conn_routes) {
+		struct device_node *node;
+		struct mtk_ddp_comp *comp;
+		unsigned int comp_id;
+
+		for (i = 0; i < num_conn_routes; i++) {
+			comp_id = conn_routes[i].route_ddp;
+			node = priv->comp_node[comp_id];
+			comp = &priv->ddp_comp[comp_id];
+
+			if (!comp->dev) {
+				dev_dbg(dev, "comp_id:%d, Component %pOF not initialized\n",
+					comp_id, node);
+				comp->encoder_index = -1;
+				continue;
+			}
+
+			mtk_ddp_comp_encoder_index_set(&priv->ddp_comp[comp_id]);
+		}
+
+		mtk_crtc->num_conn_routes = num_conn_routes;
+		mtk_crtc->conn_routes = conn_routes;
+
+		/* append the last ddp_comp and ddp_comp_nr at the end of mtk_drm_crtc_create */
+		mtk_crtc->ddp_comp[mtk_crtc->ddp_comp_nr] =
+			devm_kmalloc(dev, sizeof(*mtk_crtc->ddp_comp), GFP_KERNEL);
+		if (!mtk_crtc->ddp_comp[mtk_crtc->ddp_comp_nr])
+			return -ENOMEM;
+
+		mtk_crtc->ddp_comp_nr++;
+	}
+
 	return 0;
 }
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
index 3e9046993d09..3c224595fa71 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
@@ -8,6 +8,7 @@
 
 #include <drm/drm_crtc.h>
 #include "mtk_drm_ddp_comp.h"
+#include "mtk_drm_drv.h"
 #include "mtk_drm_plane.h"
 
 #define MTK_LUT_SIZE	512
@@ -18,7 +19,9 @@ void mtk_drm_crtc_commit(struct drm_crtc *crtc);
 int mtk_drm_crtc_create(struct drm_device *drm_dev,
 			const unsigned int *path,
 			unsigned int path_len,
-			int priv_data_index);
+			int priv_data_index,
+			const struct mtk_drm_route *conn_routes,
+			unsigned int num_conn_routes);
 int mtk_drm_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane,
 			     struct mtk_plane_state *state);
 void mtk_drm_crtc_async_update(struct drm_crtc *crtc, struct drm_plane *plane,
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
index effaaa769b46..c1ea112e6be8 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
@@ -508,6 +508,23 @@ static bool mtk_drm_find_comp_in_ddp(struct device *dev,
 	return false;
 }
 
+static int mtk_drm_find_comp_in_ddp_conn_path(struct device *dev,
+					      const struct mtk_drm_route *routes,
+					      unsigned int num_routes,
+					      struct mtk_ddp_comp *ddp_comp)
+{
+	unsigned int i;
+
+	if (!routes)
+		return -EINVAL;
+
+	for (i = 0; i < num_routes; i++)
+		if (dev == ddp_comp[routes[i].route_ddp].dev)
+			return BIT(routes[i].crtc_id);
+
+	return -ENODEV;
+}
+
 int mtk_ddp_comp_get_id(struct device_node *node,
 			enum mtk_ddp_comp_type comp_type)
 {
@@ -539,7 +556,15 @@ unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device *drm,
 					  private->data->third_len, private->ddp_comp))
 		ret = BIT(2);
 	else
-		DRM_INFO("Failed to find comp in ddp table\n");
+		ret = mtk_drm_find_comp_in_ddp_conn_path(dev,
+							 private->data->conn_routes,
+							 private->data->num_conn_routes,
+							 private->ddp_comp);
+
+	if (ret <= 0) {
+		DRM_INFO("Failed to find comp in ddp table, ret =%d\n", ret);
+		ret = 0;
+	}
 
 	return ret;
 }
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index c12886f31e54..9900007667a2 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -185,7 +185,10 @@ static const unsigned int mt8188_mtk_ddp_main[] = {
 	DDP_COMPONENT_GAMMA,
 	DDP_COMPONENT_POSTMASK0,
 	DDP_COMPONENT_DITHER0,
-	DDP_COMPONENT_DP_INTF0,
+};
+
+static const struct mtk_drm_route mt8188_mtk_ddp_main_routes[] = {
+	{0, DDP_COMPONENT_DP_INTF0},
 };
 
 static const unsigned int mt8192_mtk_ddp_main[] = {
@@ -287,6 +290,8 @@ static const struct mtk_mmsys_driver_data mt8186_mmsys_driver_data = {
 static const struct mtk_mmsys_driver_data mt8188_vdosys0_driver_data = {
 	.main_path = mt8188_mtk_ddp_main,
 	.main_len = ARRAY_SIZE(mt8188_mtk_ddp_main),
+	.conn_routes = mt8188_mtk_ddp_main_routes,
+	.num_conn_routes = ARRAY_SIZE(mt8188_mtk_ddp_main_routes),
 	.mmsys_dev_num = 1,
 };
 
@@ -419,6 +424,11 @@ static bool mtk_drm_find_mmsys_comp(struct mtk_drm_private *private, int comp_id
 			if (drv_data->third_path[i] == comp_id)
 				return true;
 
+	if (drv_data->num_conn_routes)
+		for (i = 0; i < drv_data->num_conn_routes; i++)
+			if (drv_data->conn_routes[i].route_ddp == comp_id)
+				return true;
+
 	return false;
 }
 
@@ -477,21 +487,23 @@ static int mtk_drm_kms_init(struct drm_device *drm)
 
 			if (i == CRTC_MAIN && priv_n->data->main_len) {
 				ret = mtk_drm_crtc_create(drm, priv_n->data->main_path,
-							  priv_n->data->main_len, j);
+							  priv_n->data->main_len, j,
+							  priv_n->data->conn_routes,
+							  priv_n->data->num_conn_routes);
 				if (ret)
 					goto err_component_unbind;
 
 				continue;
 			} else if (i == CRTC_EXT && priv_n->data->ext_len) {
 				ret = mtk_drm_crtc_create(drm, priv_n->data->ext_path,
-							  priv_n->data->ext_len, j);
+							  priv_n->data->ext_len, j, NULL, 0);
 				if (ret)
 					goto err_component_unbind;
 
 				continue;
 			} else if (i == CRTC_THIRD && priv_n->data->third_len) {
 				ret = mtk_drm_crtc_create(drm, priv_n->data->third_path,
-							  priv_n->data->third_len, j);
+							  priv_n->data->third_len, j, NULL, 0);
 				if (ret)
 					goto err_component_unbind;
 
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
index f4de8bb27685..6f98fff4f1a4 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
@@ -28,6 +28,11 @@ struct drm_fb_helper;
 struct drm_property;
 struct regmap;
 
+struct mtk_drm_route {
+	const unsigned int crtc_id;
+	const unsigned int route_ddp;
+};
+
 struct mtk_mmsys_driver_data {
 	const unsigned int *main_path;
 	unsigned int main_len;
@@ -35,6 +40,8 @@ struct mtk_mmsys_driver_data {
 	unsigned int ext_len;
 	const unsigned int *third_path;
 	unsigned int third_len;
+	const struct mtk_drm_route *conn_routes;
+	unsigned int num_conn_routes;
 
 	bool shadow_register;
 	unsigned int mmsys_id;
-- 
2.18.0


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH v8 7/8] drm/mediatek: dsi: Support dynamic connector selection
  2023-08-02 14:47 [PATCH v8 0/8] Add dynamic connector selection mechanism Jason-JH.Lin
                   ` (5 preceding siblings ...)
  2023-08-02 14:48 ` [PATCH v8 6/8] drm/mediatek: Add ability to support " Jason-JH.Lin
@ 2023-08-02 14:48 ` Jason-JH.Lin
  2023-08-02 14:48 ` [PATCH v8 8/8] drm/mediatek: Support DSI on MT8188 VDOSYS0 Jason-JH.Lin
  7 siblings, 0 replies; 15+ messages in thread
From: Jason-JH.Lin @ 2023-08-02 14:48 UTC (permalink / raw)
  To: Chun-Kuang Hu, AngeloGioacchino Del Regno, Eugen Hristev
  Cc: Jason-JH . Lin, Singo Chang, linux-kernel, dri-devel,
	Project_Global_Chrome_Upstream_Group, Jason-ch Chen, Nancy Lin,
	Johnson Wang, Shawn Sung, Matthias Brugger, linux-mediatek,
	linux-arm-kernel

Add implementation of mtk_dsi_encoder_index to mtk_ddp_comp_func
to make mtk_dsi support dynamic connector selection.

Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
---
 drivers/gpu/drm/mediatek/mtk_disp_drv.h     | 1 +
 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 1 +
 drivers/gpu/drm/mediatek/mtk_dsi.c          | 9 +++++++++
 3 files changed, 11 insertions(+)

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
index 5f07037670e9..fdaa21b6a9da 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h
+++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
@@ -48,6 +48,7 @@ unsigned int mtk_dpi_encoder_index(struct device *dev);
 
 void mtk_dsi_ddp_start(struct device *dev);
 void mtk_dsi_ddp_stop(struct device *dev);
+unsigned int mtk_dsi_encoder_index(struct device *dev);
 
 int mtk_gamma_clk_enable(struct device *dev);
 void mtk_gamma_clk_disable(struct device *dev);
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
index c1ea112e6be8..c93b1bae00dc 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
@@ -318,6 +318,7 @@ static const struct mtk_ddp_comp_funcs ddp_dsc = {
 static const struct mtk_ddp_comp_funcs ddp_dsi = {
 	.start = mtk_dsi_ddp_start,
 	.stop = mtk_dsi_ddp_stop,
+	.encoder_index = mtk_dsi_encoder_index,
 };
 
 static const struct mtk_ddp_comp_funcs ddp_gamma = {
diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
index 7d5250351193..8c45dc19d39f 100644
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@ -865,6 +865,15 @@ static int mtk_dsi_encoder_init(struct drm_device *drm, struct mtk_dsi *dsi)
 	return ret;
 }
 
+unsigned int mtk_dsi_encoder_index(struct device *dev)
+{
+	struct mtk_dsi *dsi = dev_get_drvdata(dev);
+	unsigned int encoder_index = drm_encoder_index(&dsi->encoder);
+
+	dev_dbg(dev, "encoder index:%d\n", encoder_index);
+	return encoder_index;
+}
+
 static int mtk_dsi_bind(struct device *dev, struct device *master, void *data)
 {
 	int ret;
-- 
2.18.0


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH v8 8/8] drm/mediatek: Support DSI on MT8188 VDOSYS0
  2023-08-02 14:47 [PATCH v8 0/8] Add dynamic connector selection mechanism Jason-JH.Lin
                   ` (6 preceding siblings ...)
  2023-08-02 14:48 ` [PATCH v8 7/8] drm/mediatek: dsi: Support " Jason-JH.Lin
@ 2023-08-02 14:48 ` Jason-JH.Lin
  7 siblings, 0 replies; 15+ messages in thread
From: Jason-JH.Lin @ 2023-08-02 14:48 UTC (permalink / raw)
  To: Chun-Kuang Hu, AngeloGioacchino Del Regno, Eugen Hristev
  Cc: Nathan Lu, Jason-JH . Lin, Singo Chang, linux-kernel, dri-devel,
	Project_Global_Chrome_Upstream_Group, Jason-ch Chen, Nancy Lin,
	Johnson Wang, Shawn Sung, Matthias Brugger, linux-mediatek,
	linux-arm-kernel

Add DSI as a main display output selection on MT8188 VDOSYS0.

Signed-off-by: Nathan Lu <nathan.lu@mediatek.com>
Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
---
 drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index 9900007667a2..fb7909b21bfa 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -189,6 +189,7 @@ static const unsigned int mt8188_mtk_ddp_main[] = {
 
 static const struct mtk_drm_route mt8188_mtk_ddp_main_routes[] = {
 	{0, DDP_COMPONENT_DP_INTF0},
+	{0, DDP_COMPONENT_DSI0},
 };
 
 static const unsigned int mt8192_mtk_ddp_main[] = {
-- 
2.18.0


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* Re: [PATCH v8 2/8] drm/mediatevk: Add crtc path enum for all_drm_priv array
  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 (林睿祥)
  0 siblings, 1 reply; 15+ messages in thread
From: Eugen Hristev @ 2023-08-03 13:18 UTC (permalink / raw)
  To: Jason-JH.Lin, Chun-Kuang Hu, AngeloGioacchino Del Regno
  Cc: Singo Chang, linux-kernel, dri-devel,
	Project_Global_Chrome_Upstream_Group, Jason-ch Chen, Nancy Lin,
	Johnson Wang, Shawn Sung, Matthias Brugger, linux-mediatek,
	linux-arm-kernel

On 8/2/23 17:47, Jason-JH.Lin wrote:
> Add mtk_drm_crtc_path enum for eatch display path.

Typo: each

> 
> Instead of using array index of all_drm_priv in mtk_drm_kms_init(),
> mtk_drm_crtc_path enum can make more readable.

can make *code* more readable ?
> 
> Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
> ---
>   drivers/gpu/drm/mediatek/mtk_drm_drv.c | 6 +++---
>   drivers/gpu/drm/mediatek/mtk_drm_drv.h | 8 +++++++-
>   2 files changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> index 249c9fd6347e..89a38561ba27 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> @@ -465,21 +465,21 @@ static int mtk_drm_kms_init(struct drm_device *drm)
>   		for (j = 0; j < private->data->mmsys_dev_num; j++) {
>   			priv_n = private->all_drm_private[j];
>   
> -			if (i == 0 && priv_n->data->main_len) {
> +			if (i == CRTC_MAIN && priv_n->data->main_len) {
>   				ret = mtk_drm_crtc_create(drm, priv_n->data->main_path,
>   							  priv_n->data->main_len, j);
>   				if (ret)
>   					goto err_component_unbind;
>   
>   				continue;
> -			} else if (i == 1 && priv_n->data->ext_len) {
> +			} else if (i == CRTC_EXT && priv_n->data->ext_len) {
>   				ret = mtk_drm_crtc_create(drm, priv_n->data->ext_path,
>   							  priv_n->data->ext_len, j);
>   				if (ret)
>   					goto err_component_unbind;
>   
>   				continue;
> -			} else if (i == 2 && priv_n->data->third_len) {
> +			} else if (i == CRTC_THIRD && priv_n->data->third_len) {
>   				ret = mtk_drm_crtc_create(drm, priv_n->data->third_path,
>   							  priv_n->data->third_len, j);
>   				if (ret)
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
> index eb2fd45941f0..f4de8bb27685 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
> @@ -9,11 +9,17 @@
>   #include <linux/io.h>
>   #include "mtk_drm_ddp_comp.h"
>   
> -#define MAX_CRTC	3
>   #define MAX_CONNECTOR	2
>   #define DDP_COMPONENT_DRM_OVL_ADAPTOR (DDP_COMPONENT_ID_MAX + 1)
>   #define DDP_COMPONENT_DRM_ID_MAX (DDP_COMPONENT_DRM_OVL_ADAPTOR + 1)
>   
> +enum mtk_drm_crtc_path {
> +	CRTC_MAIN,
> +	CRTC_EXT,
> +	CRTC_THIRD,
> +	MAX_CRTC,
> +};
> +
>   struct device;
>   struct device_node;
>   struct drm_crtc;


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH v8 3/8] drm/mediatek: Fix using wrong drm private data to bind mediatek-drm
  2023-08-02 14:47 ` [PATCH v8 3/8] drm/mediatek: Fix using wrong drm private data to bind mediatek-drm Jason-JH.Lin
@ 2023-08-03 13:22   ` Eugen Hristev
  2023-08-05  8:05     ` Jason-JH Lin (林睿祥)
  0 siblings, 1 reply; 15+ messages in thread
From: Eugen Hristev @ 2023-08-03 13:22 UTC (permalink / raw)
  To: Jason-JH.Lin, Chun-Kuang Hu, AngeloGioacchino Del Regno
  Cc: Singo Chang, linux-kernel, dri-devel,
	Project_Global_Chrome_Upstream_Group, Jason-ch Chen, Nancy Lin,
	Johnson Wang, Shawn Sung, Matthias Brugger, linux-mediatek,
	linux-arm-kernel

On 8/2/23 17:47, Jason-JH.Lin wrote:
> 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

s/should has/should have/ ?

> 
> 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) {

This is inside a 'for' loop right ?
Why don't you just 'continue' if temp_drm_priv is null ?


> +			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) {


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH v8 4/8] drm/mediatek: Add encoder_index function to mtk_ddp_comp_funcs
  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 (林睿祥)
  0 siblings, 1 reply; 15+ messages in thread
From: Eugen Hristev @ 2023-08-03 13:27 UTC (permalink / raw)
  To: Jason-JH.Lin, Chun-Kuang Hu, AngeloGioacchino Del Regno
  Cc: Singo Chang, linux-kernel, dri-devel,
	Project_Global_Chrome_Upstream_Group, Jason-ch Chen, Nancy Lin,
	Johnson Wang, Shawn Sung, Matthias Brugger, linux-mediatek,
	linux-arm-kernel

On 8/2/23 17:47, Jason-JH.Lin wrote:
> 1. Add encoder_index function to mtk_ddp_comp_funcs to support dynamic
> connector selection for some ddp_comp who has encoder_index.
> 2. Add mtk_ddp_comp_encoder_index_set function to set encoder_index to
> each comp.
> 

Usually a commit that does two things in a list is supposed to be two 
actual commits.


> Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
> ---
>   drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 8 ++++++++
>   1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> index febcaeef16a1..8428baca70f4 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> @@ -80,6 +80,7 @@ struct mtk_ddp_comp_funcs {
>   	void (*disconnect)(struct device *dev, struct device *mmsys_dev, unsigned int next);
>   	void (*add)(struct device *dev, struct mtk_mutex *mutex);
>   	void (*remove)(struct device *dev, struct mtk_mutex *mutex);
> +	unsigned int (*encoder_index)(struct device *dev);
>   };
>   
>   struct mtk_ddp_comp {
> @@ -87,6 +88,7 @@ struct mtk_ddp_comp {
>   	int irq;
>   	unsigned int id;
>   	const struct mtk_ddp_comp_funcs *funcs;
> +	unsigned int encoder_index;

For better alignment I would suggest variables to be declared together 
and pointers afterwards, not mixed up

>   };
>   
>   static inline int mtk_ddp_comp_clk_enable(struct mtk_ddp_comp *comp)
> @@ -275,6 +277,12 @@ static inline bool mtk_ddp_comp_disconnect(struct mtk_ddp_comp *comp, struct dev
>   	return false;
>   }
>   
> +static inline void mtk_ddp_comp_encoder_index_set(struct mtk_ddp_comp *comp)
> +{
> +	if (comp->funcs && comp->funcs->encoder_index)
> +		comp->encoder_index = comp->funcs->encoder_index(comp->dev);
> +}

it's also a bit strange that you added a function that is not used 
anywhere. Don't you get like a compiler warning for it ?

> +
>   int mtk_ddp_comp_get_id(struct device_node *node,
>   			enum mtk_ddp_comp_type comp_type);
>   unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device *drm,


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH v8 2/8] drm/mediatevk: Add crtc path enum for all_drm_priv array
  2023-08-03 13:18   ` Eugen Hristev
@ 2023-08-05  7:27     ` Jason-JH Lin (林睿祥)
  0 siblings, 0 replies; 15+ messages in thread
From: Jason-JH Lin (林睿祥) @ 2023-08-05  7:27 UTC (permalink / raw)
  To: chunkuang.hu@kernel.org, angelogioacchino.delregno@collabora.com,
	eugen.hristev@collabora.com
  Cc: Singo Chang (張興國),
	linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
	Project_Global_Chrome_Upstream_Group,
	Jason-ch Chen (陳建豪),
	Nancy Lin (林欣螢),
	Johnson Wang (王聖鑫),
	Shawn Sung (宋孝謙), matthias.bgg@gmail.com,
	linux-mediatek@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org

[-- Attachment #1: Type: text/html, Size: 1846 bytes --]

[-- Attachment #2: Type: text/plain, Size: 561 bytes --]

Hi Eugen,

Thanks for the reviews.

On Thu, 2023-08-03 at 16:18 +0300, Eugen Hristev wrote:
> > 

> On 8/2/23 17:47, Jason-JH.Lin wrote:
> > Add mtk_drm_crtc_path enum for eatch display path.
> 
> Typo: each
> 
I'll fix it.

> > 
> > Instead of using array index of all_drm_priv in mtk_drm_kms_init(),
> > mtk_drm_crtc_path enum can make more readable.
> 
> can make *code* more readable ?

Yes, I'll correct it at the next version.
Thanks.

Regards,
Jason-JH.Lin

> > Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
> > ---

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH v8 4/8] drm/mediatek: Add encoder_index function to mtk_ddp_comp_funcs
  2023-08-03 13:27   ` Eugen Hristev
@ 2023-08-05  7:40     ` Jason-JH Lin (林睿祥)
  0 siblings, 0 replies; 15+ messages in thread
From: Jason-JH Lin (林睿祥) @ 2023-08-05  7:40 UTC (permalink / raw)
  To: chunkuang.hu@kernel.org, angelogioacchino.delregno@collabora.com,
	eugen.hristev@collabora.com
  Cc: Singo Chang (張興國),
	linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
	Project_Global_Chrome_Upstream_Group,
	Jason-ch Chen (陳建豪),
	Nancy Lin (林欣螢),
	Johnson Wang (王聖鑫),
	Shawn Sung (宋孝謙), matthias.bgg@gmail.com,
	linux-mediatek@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org

[-- Attachment #1: Type: text/html, Size: 5606 bytes --]

[-- Attachment #2: Type: text/plain, Size: 2733 bytes --]

Hi Eugen,

Thanks for the reviews.

On Thu, 2023-08-03 at 16:27 +0300, Eugen Hristev wrote:
> On 8/2/23 17:47, Jason-JH.Lin wrote:
> > 1. Add encoder_index function to mtk_ddp_comp_funcs to support
> > dynamic
> > connector selection for some ddp_comp who has encoder_index.
> > 2. Add mtk_ddp_comp_encoder_index_set function to set encoder_index
> > to
> > each comp.
> > 
> 
> Usually a commit that does two things in a list is supposed to be
> two 
> actual commits.
> 
OK, I'll move the second part to [PATCH v8 6/8].

> 
> > Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
> > ---
> >   drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 8 ++++++++
> >   1 file changed, 8 insertions(+)
> > 
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> > b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> > index febcaeef16a1..8428baca70f4 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> > @@ -80,6 +80,7 @@ struct mtk_ddp_comp_funcs {
> >   	void (*disconnect)(struct device *dev, struct device
> > *mmsys_dev, unsigned int next);
> >   	void (*add)(struct device *dev, struct mtk_mutex *mutex);
> >   	void (*remove)(struct device *dev, struct mtk_mutex *mutex);
> > +	unsigned int (*encoder_index)(struct device *dev);
> >   };
> >   
> >   struct mtk_ddp_comp {
> > @@ -87,6 +88,7 @@ struct mtk_ddp_comp {
> >   	int irq;
> >   	unsigned int id;
> >   	const struct mtk_ddp_comp_funcs *funcs;
> > +	unsigned int encoder_index;
> 
> For better alignment I would suggest variables to be declared
> together 
> and pointers afterwards, not mixed up
> 

OK, I'll move it between `unsigned int id` and `const struct
mtk_ddp_comp_funcs *funcs`.


> >   };
> >   
> >   static inline int mtk_ddp_comp_clk_enable(struct mtk_ddp_comp
> > *comp)
> > @@ -275,6 +277,12 @@ static inline bool
> > mtk_ddp_comp_disconnect(struct mtk_ddp_comp *comp, struct dev
> >   	return false;
> >   }
> >   
> > +static inline void mtk_ddp_comp_encoder_index_set(struct
> > mtk_ddp_comp *comp)
> > +{
> > +	if (comp->funcs && comp->funcs->encoder_index)
> > +		comp->encoder_index = comp->funcs->encoder_index(comp-
> > >dev);
> > +}
> 
> it's also a bit strange that you added a function that is not used 
> anywhere. Don't you get like a compiler warning for it ?
> 
Because it's used in mtk_drm_crtc_create() in [PATCH v8 6/8].
I'll move this part into [PATCH v8 6/8].

Regards,
Jason-JH.Lin

> > +
> >   int mtk_ddp_comp_get_id(struct device_node *node,
> >   			enum mtk_ddp_comp_type comp_type);
> >   unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device
> > *drm,
> 
> 

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH v8 3/8] drm/mediatek: Fix using wrong drm private data to bind mediatek-drm
  2023-08-03 13:22   ` Eugen Hristev
@ 2023-08-05  8:05     ` Jason-JH Lin (林睿祥)
  0 siblings, 0 replies; 15+ messages in thread
From: Jason-JH Lin (林睿祥) @ 2023-08-05  8:05 UTC (permalink / raw)
  To: chunkuang.hu@kernel.org, angelogioacchino.delregno@collabora.com,
	eugen.hristev@collabora.com
  Cc: Singo Chang (張興國),
	linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
	Project_Global_Chrome_Upstream_Group,
	Jason-ch Chen (陳建豪),
	Nancy Lin (林欣螢),
	Johnson Wang (王聖鑫),
	Shawn Sung (宋孝謙), matthias.bgg@gmail.com,
	linux-mediatek@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org

[-- Attachment #1: Type: text/html, Size: 6266 bytes --]

[-- Attachment #2: Type: text/plain, Size: 3286 bytes --]

Hi Eugen,

Thanks for the reviews.

On Thu, 2023-08-03 at 16:22 +0300, Eugen Hristev wrote:
> On 8/2/23 17:47, Jason-JH.Lin wrote:
> > 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
> 
> s/should has/should have/ ?
> 

Although each element is singular, `should have` is correct.

`should` is an auxiliary verb, so we can only use infinitive verbs
after that. 

So this part of comment should be like this:
In mtk_drm_kms_init(), each element in all_drm_priv should have one
display path private data, such as:
all_drm_priv[CRTC_MAIN] should only have main_path data
all_drm_priv[CRTC_EXT] should only have ext_path data
all_drm_priv[CRTC_THIRD] should only have third_path data

Right?

> > 
> > 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) {
> 
> This is inside a 'for' loop right ?
> Why don't you just 'continue' if temp_drm_priv is null ?
> 

Yes, you are right.
I'll use `if (!temp_drm_priv) continue;` to make this statement
simpler. Thanks.

Regards,
Jason-JH.Lin.

> 
> > +			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) {
> 
> 

^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2023-08-05  8:06 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 ` [PATCH v8 3/8] drm/mediatek: Fix using wrong drm private data to bind mediatek-drm Jason-JH.Lin
2023-08-03 13:22   ` 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

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).