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 v4 8/9] drm/mediatek: add third ddp path
Date: Mon, 28 May 2018 14:38:26 +0800 [thread overview]
Message-ID: <1527489507-24453-9-git-send-email-stu.hsieh@mediatek.com> (raw)
In-Reply-To: <1527489507-24453-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 | 7 +++++--
3 files changed, 13 insertions(+), 2 deletions(-)
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..d867e2683923 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
@@ -17,8 +17,8 @@
#include <linux/io.h>
#include "mtk_drm_ddp_comp.h"
-#define MAX_CRTC 2
-#define MAX_CONNECTOR 2
+#define MAX_CRTC 3
+#define MAX_CONNECTOR 3
struct device;
struct device_node;
@@ -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-05-28 6:38 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-28 6:38 [PATCH v4 0/9] Add support for mediatek SOC MT2712 Stu Hsieh
2018-05-28 6:38 ` [PATCH v4 1/9] drm/mediatek: update dt-bindings for mt2712 Stu Hsieh
2018-05-31 2:47 ` Rob Herring
2018-05-28 6:38 ` [PATCH v4 2/9] drm/mediatek: support maximum 64 mutex mod Stu Hsieh
2018-05-28 6:38 ` [PATCH v4 3/9] drm/mediatek: add ddp component AAL1 Stu Hsieh
2018-05-28 7:03 ` CK Hu
2018-05-28 6:38 ` [PATCH v4 4/9] drm/mediatek: add ddp component OD1 Stu Hsieh
2018-05-28 7:07 ` CK Hu
2018-05-28 6:38 ` [PATCH v4 5/9] drm/mediatek: add ddp component PWM1 Stu Hsieh
2018-05-28 7:08 ` CK Hu
2018-05-28 6:38 ` [PATCH v4 6/9] drm/mediatek: add ddp component PWM2 Stu Hsieh
2018-05-28 7:09 ` CK Hu
2018-05-28 6:38 ` [PATCH v4 7/9] drm/mediatek: add connection from OD1 to RDMA1 Stu Hsieh
2018-05-28 7:13 ` CK Hu
2018-05-28 6:38 ` Stu Hsieh [this message]
2018-05-28 7:47 ` [PATCH v4 8/9] drm/mediatek: add third ddp path CK Hu
2018-06-08 8:31 ` Stu Hsieh
2018-05-28 6:38 ` [PATCH v4 9/9] drm/mediatek: Add support for mediatek SOC MT2712 Stu Hsieh
2018-05-28 7:53 ` CK Hu
2018-06-08 8:38 ` Stu Hsieh
2018-05-30 9:42 ` kbuild test robot
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=1527489507-24453-9-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 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).