From: Stu Hsieh <stu.hsieh@mediatek.com>
To: CK Hu <ck.hu@mediatek.com>, Philipp Zabel <p.zabel@pengutronix.de>
Cc: David Airlie <airlied@linux.ie>, Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
<dri-devel@lists.freedesktop.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
<srv_heupstream@mediatek.com>, Stu Hsieh <stu.hsieh@mediatek.com>
Subject: [PATCH 27/28] drm/mediatek: add third ddp path
Date: Mon, 11 Jun 2018 11:26:19 +0800 [thread overview]
Message-ID: <1528687580-549-28-git-send-email-stu.hsieh@mediatek.com> (raw)
In-Reply-To: <1528687580-549-1-git-send-email-stu.hsieh@mediatek.com>
This patch create third crtc by third ddp path
Signed-off-by: Stu Hsieh <stu.hsieh@mediatek.com>
---
drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 3 +++
drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 +++++
drivers/gpu/drm/mediatek/mtk_drm_drv.h | 5 ++++-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index 658b8dd45b83..2d6aa150a9ff 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -539,6 +539,9 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
int ret;
int i;
+ if (!path)
+ return 0;
+
for (i = 0; i < path_len; i++) {
enum mtk_ddp_comp_id comp_id = path[i];
struct device_node *node;
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index 08d5d0b47bfe..3d279a299383 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -232,6 +232,11 @@ static int mtk_drm_kms_init(struct drm_device *drm)
if (ret < 0)
goto err_component_unbind;
+ ret = mtk_drm_crtc_create(drm, private->data->third_path,
+ private->data->third_len);
+ if (ret < 0)
+ goto err_component_unbind;
+
/* Use OVL device for all DMA memory allocations */
np = private->comp_node[private->data->main_path[0]] ?:
private->comp_node[private->data->ext_path[0]];
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
index c3378c452c0a..ecc00ca3221d 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
@@ -17,7 +17,7 @@
#include <linux/io.h>
#include "mtk_drm_ddp_comp.h"
-#define MAX_CRTC 2
+#define MAX_CRTC 3
#define MAX_CONNECTOR 2
struct device;
@@ -33,6 +33,9 @@ struct mtk_mmsys_driver_data {
unsigned int main_len;
const enum mtk_ddp_comp_id *ext_path;
unsigned int ext_len;
+ const enum mtk_ddp_comp_id *third_path;
+ unsigned int third_len;
+
bool shadow_register;
};
--
2.12.5
WARNING: multiple messages have this Message-ID (diff)
From: Stu Hsieh <stu.hsieh@mediatek.com>
To: CK Hu <ck.hu@mediatek.com>, Philipp Zabel <p.zabel@pengutronix.de>
Cc: David Airlie <airlied@linux.ie>, Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, srv_heupstream@mediatek.com,
Stu Hsieh <stu.hsieh@mediatek.com>
Subject: [PATCH 27/28] drm/mediatek: add third ddp path
Date: Mon, 11 Jun 2018 11:26:19 +0800 [thread overview]
Message-ID: <1528687580-549-28-git-send-email-stu.hsieh@mediatek.com> (raw)
In-Reply-To: <1528687580-549-1-git-send-email-stu.hsieh@mediatek.com>
This patch create third crtc by third ddp path
Signed-off-by: Stu Hsieh <stu.hsieh@mediatek.com>
---
drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 3 +++
drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 +++++
drivers/gpu/drm/mediatek/mtk_drm_drv.h | 5 ++++-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index 658b8dd45b83..2d6aa150a9ff 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -539,6 +539,9 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
int ret;
int i;
+ if (!path)
+ return 0;
+
for (i = 0; i < path_len; i++) {
enum mtk_ddp_comp_id comp_id = path[i];
struct device_node *node;
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index 08d5d0b47bfe..3d279a299383 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -232,6 +232,11 @@ static int mtk_drm_kms_init(struct drm_device *drm)
if (ret < 0)
goto err_component_unbind;
+ ret = mtk_drm_crtc_create(drm, private->data->third_path,
+ private->data->third_len);
+ if (ret < 0)
+ goto err_component_unbind;
+
/* Use OVL device for all DMA memory allocations */
np = private->comp_node[private->data->main_path[0]] ?:
private->comp_node[private->data->ext_path[0]];
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
index c3378c452c0a..ecc00ca3221d 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
@@ -17,7 +17,7 @@
#include <linux/io.h>
#include "mtk_drm_ddp_comp.h"
-#define MAX_CRTC 2
+#define MAX_CRTC 3
#define MAX_CONNECTOR 2
struct device;
@@ -33,6 +33,9 @@ struct mtk_mmsys_driver_data {
unsigned int main_len;
const enum mtk_ddp_comp_id *ext_path;
unsigned int ext_len;
+ const enum mtk_ddp_comp_id *third_path;
+ unsigned int third_len;
+
bool shadow_register;
};
--
2.12.5
WARNING: multiple messages have this Message-ID (diff)
From: stu.hsieh@mediatek.com (Stu Hsieh)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 27/28] drm/mediatek: add third ddp path
Date: Mon, 11 Jun 2018 11:26:19 +0800 [thread overview]
Message-ID: <1528687580-549-28-git-send-email-stu.hsieh@mediatek.com> (raw)
In-Reply-To: <1528687580-549-1-git-send-email-stu.hsieh@mediatek.com>
This patch create third crtc by third ddp path
Signed-off-by: Stu Hsieh <stu.hsieh@mediatek.com>
---
drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 3 +++
drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 +++++
drivers/gpu/drm/mediatek/mtk_drm_drv.h | 5 ++++-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index 658b8dd45b83..2d6aa150a9ff 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -539,6 +539,9 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
int ret;
int i;
+ if (!path)
+ return 0;
+
for (i = 0; i < path_len; i++) {
enum mtk_ddp_comp_id comp_id = path[i];
struct device_node *node;
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index 08d5d0b47bfe..3d279a299383 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -232,6 +232,11 @@ static int mtk_drm_kms_init(struct drm_device *drm)
if (ret < 0)
goto err_component_unbind;
+ ret = mtk_drm_crtc_create(drm, private->data->third_path,
+ private->data->third_len);
+ if (ret < 0)
+ goto err_component_unbind;
+
/* Use OVL device for all DMA memory allocations */
np = private->comp_node[private->data->main_path[0]] ?:
private->comp_node[private->data->ext_path[0]];
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
index c3378c452c0a..ecc00ca3221d 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
@@ -17,7 +17,7 @@
#include <linux/io.h>
#include "mtk_drm_ddp_comp.h"
-#define MAX_CRTC 2
+#define MAX_CRTC 3
#define MAX_CONNECTOR 2
struct device;
@@ -33,6 +33,9 @@ struct mtk_mmsys_driver_data {
unsigned int main_len;
const enum mtk_ddp_comp_id *ext_path;
unsigned int ext_len;
+ const enum mtk_ddp_comp_id *third_path;
+ unsigned int third_len;
+
bool shadow_register;
};
--
2.12.5
next prev parent reply other threads:[~2018-06-11 3:27 UTC|newest]
Thread overview: 189+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-11 3:25 [PATCH v5 00/28] Add support for mediatek SOC MT2712 Stu Hsieh
2018-06-11 3:25 ` Stu Hsieh
2018-06-11 3:25 ` Stu Hsieh
2018-06-11 3:25 ` [PATCH 01/28] drm/mediatek: update dt-bindings for mt2712 Stu Hsieh
2018-06-11 3:25 ` Stu Hsieh
2018-06-11 3:25 ` Stu Hsieh
2018-06-11 3:25 ` [PATCH 02/28] drm/mediatek: support maximum 64 mutex mod Stu Hsieh
2018-06-11 3:25 ` Stu Hsieh
2018-06-11 3:25 ` Stu Hsieh
2018-06-11 3:25 ` [PATCH 03/28] drm/mediatek: add ddp component AAL1 Stu Hsieh
2018-06-11 3:25 ` Stu Hsieh
2018-06-11 3:25 ` Stu Hsieh
2018-06-11 3:25 ` [PATCH 04/28] drm/mediatek: add ddp component OD1 Stu Hsieh
2018-06-11 3:25 ` Stu Hsieh
2018-06-11 3:25 ` Stu Hsieh
2018-06-13 5:27 ` CK Hu
2018-06-13 5:27 ` CK Hu
2018-06-13 5:27 ` CK Hu
2018-06-11 3:25 ` [PATCH 05/28] drm/mediatek: add ddp component PWM1 Stu Hsieh
2018-06-11 3:25 ` Stu Hsieh
2018-06-11 3:25 ` Stu Hsieh
2018-06-11 3:25 ` [PATCH 06/28] drm/mediatek: add ddp component PWM2 Stu Hsieh
2018-06-11 3:25 ` Stu Hsieh
2018-06-11 3:25 ` Stu Hsieh
2018-06-11 3:25 ` [PATCH 07/28] drm/mediatek: add component DPI1 Stu Hsieh
2018-06-11 3:25 ` Stu Hsieh
2018-06-11 3:25 ` Stu Hsieh
2018-06-13 5:29 ` CK Hu
2018-06-13 5:29 ` CK Hu
2018-06-13 5:29 ` CK Hu
2018-06-11 3:26 ` [PATCH 08/28] drm/mediatek: add component DSI2 Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-13 5:30 ` CK Hu
2018-06-13 5:30 ` CK Hu
2018-06-13 5:30 ` CK Hu
2018-06-11 3:26 ` [PATCH 09/28] drm/mediatek: add component DSI3 Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-13 5:31 ` CK Hu
2018-06-13 5:31 ` CK Hu
2018-06-13 5:31 ` CK Hu
2018-06-11 3:26 ` [PATCH 10/28] drm/mediatek: add connection from OD1 to RDMA1 Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-11 3:26 ` [PATCH 11/28] drm/mediatek: add connection from RDMA0 to DPI0 Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-13 5:38 ` CK Hu
2018-06-13 5:38 ` CK Hu
2018-06-13 5:38 ` CK Hu
2018-06-11 3:26 ` [PATCH 12/28] drm/mediatek: add connection from RDMA0 to DSI2 Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-13 5:39 ` CK Hu
2018-06-13 5:39 ` CK Hu
2018-06-13 5:39 ` CK Hu
2018-06-11 3:26 ` [PATCH 13/28] drm/mediatek: add connection from RDMA0 to DSI3 Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-13 5:45 ` CK Hu
2018-06-13 5:45 ` CK Hu
2018-06-13 5:45 ` CK Hu
2018-06-13 7:46 ` Stu Hsieh
2018-06-13 7:46 ` Stu Hsieh
2018-06-13 7:46 ` Stu Hsieh
2018-06-13 8:05 ` CK Hu
2018-06-13 8:05 ` CK Hu
2018-06-13 8:05 ` CK Hu
2018-06-13 8:52 ` Stu Hsieh
2018-06-13 8:52 ` Stu Hsieh
2018-06-13 8:52 ` Stu Hsieh
2018-06-11 3:26 ` [PATCH 14/28] drm/mediatek: add connection from RDMA1 to DPI1 Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-13 6:13 ` CK Hu
2018-06-13 6:13 ` CK Hu
2018-06-13 6:13 ` CK Hu
2018-06-13 7:56 ` Stu Hsieh
2018-06-13 7:56 ` Stu Hsieh
2018-06-13 7:56 ` Stu Hsieh
2018-06-13 8:27 ` CK Hu
2018-06-13 8:27 ` CK Hu
2018-06-13 8:27 ` CK Hu
2018-06-13 8:53 ` Stu Hsieh
2018-06-13 8:53 ` Stu Hsieh
2018-06-13 8:53 ` Stu Hsieh
2018-06-11 3:26 ` [PATCH 15/28] drm/mediatek: add connection from RDMA1 to DSI1 Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-13 6:44 ` CK Hu
2018-06-13 6:44 ` CK Hu
2018-06-13 6:44 ` CK Hu
2018-06-13 6:59 ` CK Hu
2018-06-13 6:59 ` CK Hu
2018-06-13 6:59 ` CK Hu
2018-06-11 3:26 ` [PATCH 16/28] drm/mediatek: add connection from RDMA1 to DSI2 Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-13 7:00 ` CK Hu
2018-06-13 7:00 ` CK Hu
2018-06-13 7:00 ` CK Hu
2018-06-11 3:26 ` [PATCH 17/28] drm/mediatek: add connection from RDMA1 to DSI3 Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-13 7:04 ` CK Hu
2018-06-13 7:04 ` CK Hu
2018-06-13 7:04 ` CK Hu
2018-06-11 3:26 ` [PATCH 18/28] drm/mediatek: add connection from RDMA2 to DPI0 Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-13 7:07 ` CK Hu
2018-06-13 7:07 ` CK Hu
2018-06-13 7:07 ` CK Hu
2018-06-11 3:26 ` [PATCH 19/28] drm/mediatek: add connection from RDMA2 to DPI1 Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-13 7:13 ` CK Hu
2018-06-13 7:13 ` CK Hu
2018-06-13 7:13 ` CK Hu
2018-06-13 8:01 ` Stu Hsieh
2018-06-13 8:01 ` Stu Hsieh
2018-06-13 8:01 ` Stu Hsieh
2018-06-13 8:14 ` CK Hu
2018-06-13 8:14 ` CK Hu
2018-06-13 8:14 ` CK Hu
2018-06-13 8:58 ` Stu Hsieh
2018-06-13 8:58 ` Stu Hsieh
2018-06-13 8:58 ` Stu Hsieh
2018-06-13 9:01 ` CK Hu
2018-06-13 9:01 ` CK Hu
2018-06-13 9:01 ` CK Hu
2018-06-11 3:26 ` [PATCH 20/28] drm/mediatek: add connection from RDMA2 to DSI1 Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-13 7:17 ` CK Hu
2018-06-13 7:17 ` CK Hu
2018-06-13 7:17 ` CK Hu
2018-06-11 3:26 ` [PATCH 21/28] drm/mediatek: add connection from RDMA2 to DSI2 Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-13 7:18 ` CK Hu
2018-06-13 7:18 ` CK Hu
2018-06-13 7:18 ` CK Hu
2018-06-11 3:26 ` [PATCH 22/28] drm/mediatek: add connection from RDMA2 to DSI3 Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-13 7:19 ` CK Hu
2018-06-13 7:19 ` CK Hu
2018-06-13 7:19 ` CK Hu
2018-06-11 3:26 ` [PATCH 23/28] drm/mediatek: add DPI1 support for mutex Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-13 7:22 ` CK Hu
2018-06-13 7:22 ` CK Hu
2018-06-13 7:22 ` CK Hu
2018-06-11 3:26 ` [PATCH 24/28] drm/mediatek: add DSI2 " Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-13 7:22 ` CK Hu
2018-06-13 7:22 ` CK Hu
2018-06-13 7:22 ` CK Hu
2018-06-11 3:26 ` [PATCH 25/28] drm/mediatek: add DSI3 " Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-13 7:22 ` CK Hu
2018-06-13 7:22 ` CK Hu
2018-06-13 7:22 ` CK Hu
2018-06-11 3:26 ` [PATCH 26/28] drm/mediatek: add DPI1/DSI1/DSI2/DSI3 in comp_init Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-13 7:35 ` CK Hu
2018-06-13 7:35 ` CK Hu
2018-06-13 7:35 ` CK Hu
2018-06-13 8:05 ` Stu Hsieh
2018-06-13 8:05 ` Stu Hsieh
2018-06-13 8:05 ` Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh [this message]
2018-06-11 3:26 ` [PATCH 27/28] drm/mediatek: add third ddp path Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-13 7:38 ` CK Hu
2018-06-13 7:38 ` CK Hu
2018-06-13 7:38 ` CK Hu
2018-06-11 3:26 ` [PATCH 28/28] drm/mediatek: Add support for mediatek SOC MT2712 Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-11 3:26 ` Stu Hsieh
2018-06-13 7:48 ` CK Hu
2018-06-13 7:48 ` CK Hu
2018-06-13 7:48 ` CK Hu
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=1528687580-549-28-git-send-email-stu.hsieh@mediatek.com \
--to=stu.hsieh@mediatek.com \
--cc=airlied@linux.ie \
--cc=ck.hu@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
--cc=srv_heupstream@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.