All of lore.kernel.org
 help / color / mirror / Atom feed
From: <yongqiang.niu@mediatek.com>
To: <ck.hu@mediatek.com>, <p.zabel@pengutronix.de>,
	<robh+dt@kernel.org>, <matthias.bgg@gmail.com>
Cc: <airlied@linux.ie>, <mark.rutland@arm.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>, <Bibby.Hsieh@mediatek.com>,
	<yt.shen@mediatek.com>,
	Yongqiang Niu <yongqiang.niu@mediatek.com>
Subject: [PATCH v2 14/25] drm/medaitek: add layer_nr for ovl private data
Date: Wed, 27 Mar 2019 14:19:10 +0800	[thread overview]
Message-ID: <1553667561-25447-15-git-send-email-yongqiang.niu@mediatek.com> (raw)
In-Reply-To: <1553667561-25447-1-git-send-email-yongqiang.niu@mediatek.com>

From: Yongqiang Niu <yongqiang.niu@mediatek.com>

This patch add layer_nr for ovl private data
ovl_2l almost same with with ovl hardware, except the
layer number for ovl_2l is 2 and ovl is 4.
this patch is a preparation for ovl-2l and
ovl share the same driver.

Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com>
---
 drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
index afb313c..a0ab760 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
@@ -60,6 +60,7 @@
 struct mtk_disp_ovl_data {
 	unsigned int addr;
 	unsigned int gmc_bits;
+	unsigned int layer_nr;
 	bool fmt_rgb565_is_0;
 };
 
@@ -137,7 +138,9 @@ static void mtk_ovl_config(struct mtk_ddp_comp *comp, unsigned int w,
 
 static unsigned int mtk_ovl_layer_nr(struct mtk_ddp_comp *comp)
 {
-	return 4;
+	struct mtk_disp_ovl *ovl = comp_to_ovl(comp);
+
+	return ovl->data->layer_nr;
 }
 
 static void mtk_ovl_layer_on(struct mtk_ddp_comp *comp, unsigned int idx)
@@ -342,12 +345,14 @@ static int mtk_disp_ovl_remove(struct platform_device *pdev)
 static const struct mtk_disp_ovl_data mt2701_ovl_driver_data = {
 	.addr = DISP_REG_OVL_ADDR_MT2701,
 	.gmc_bits = 8,
+	.layer_nr = 4,
 	.fmt_rgb565_is_0 = false,
 };
 
 static const struct mtk_disp_ovl_data mt8173_ovl_driver_data = {
 	.addr = DISP_REG_OVL_ADDR_MT8173,
 	.gmc_bits = 8,
+	.layer_nr = 4,
 	.fmt_rgb565_is_0 = true,
 };
 
-- 
1.8.1.1.dirty


WARNING: multiple messages have this Message-ID (diff)
From: <yongqiang.niu@mediatek.com>
To: ck.hu@mediatek.com, p.zabel@pengutronix.de, robh+dt@kernel.org,
	matthias.bgg@gmail.com
Cc: airlied@linux.ie, mark.rutland@arm.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, Bibby.Hsieh@mediatek.com,
	yt.shen@mediatek.com, Yongqiang Niu <yongqiang.niu@mediatek.com>
Subject: [PATCH v2 14/25] drm/medaitek: add layer_nr for ovl private data
Date: Wed, 27 Mar 2019 14:19:10 +0800	[thread overview]
Message-ID: <1553667561-25447-15-git-send-email-yongqiang.niu@mediatek.com> (raw)
In-Reply-To: <1553667561-25447-1-git-send-email-yongqiang.niu@mediatek.com>

From: Yongqiang Niu <yongqiang.niu@mediatek.com>

This patch add layer_nr for ovl private data
ovl_2l almost same with with ovl hardware, except the
layer number for ovl_2l is 2 and ovl is 4.
this patch is a preparation for ovl-2l and
ovl share the same driver.

Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com>
---
 drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
index afb313c..a0ab760 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
@@ -60,6 +60,7 @@
 struct mtk_disp_ovl_data {
 	unsigned int addr;
 	unsigned int gmc_bits;
+	unsigned int layer_nr;
 	bool fmt_rgb565_is_0;
 };
 
@@ -137,7 +138,9 @@ static void mtk_ovl_config(struct mtk_ddp_comp *comp, unsigned int w,
 
 static unsigned int mtk_ovl_layer_nr(struct mtk_ddp_comp *comp)
 {
-	return 4;
+	struct mtk_disp_ovl *ovl = comp_to_ovl(comp);
+
+	return ovl->data->layer_nr;
 }
 
 static void mtk_ovl_layer_on(struct mtk_ddp_comp *comp, unsigned int idx)
@@ -342,12 +345,14 @@ static int mtk_disp_ovl_remove(struct platform_device *pdev)
 static const struct mtk_disp_ovl_data mt2701_ovl_driver_data = {
 	.addr = DISP_REG_OVL_ADDR_MT2701,
 	.gmc_bits = 8,
+	.layer_nr = 4,
 	.fmt_rgb565_is_0 = false,
 };
 
 static const struct mtk_disp_ovl_data mt8173_ovl_driver_data = {
 	.addr = DISP_REG_OVL_ADDR_MT8173,
 	.gmc_bits = 8,
+	.layer_nr = 4,
 	.fmt_rgb565_is_0 = true,
 };
 
-- 
1.8.1.1.dirty

WARNING: multiple messages have this Message-ID (diff)
From: <yongqiang.niu@mediatek.com>
To: <ck.hu@mediatek.com>, <p.zabel@pengutronix.de>,
	<robh+dt@kernel.org>, <matthias.bgg@gmail.com>
Cc: mark.rutland@arm.com, devicetree@vger.kernel.org,
	Yongqiang Niu <yongqiang.niu@mediatek.com>,
	airlied@linux.ie, linux-kernel@vger.kernel.org,
	dri-devel@lists.freedesktop.org,
	linux-mediatek@lists.infradead.org, Bibby.Hsieh@mediatek.com,
	yt.shen@mediatek.com, linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 14/25] drm/medaitek: add layer_nr for ovl private data
Date: Wed, 27 Mar 2019 14:19:10 +0800	[thread overview]
Message-ID: <1553667561-25447-15-git-send-email-yongqiang.niu@mediatek.com> (raw)
In-Reply-To: <1553667561-25447-1-git-send-email-yongqiang.niu@mediatek.com>

From: Yongqiang Niu <yongqiang.niu@mediatek.com>

This patch add layer_nr for ovl private data
ovl_2l almost same with with ovl hardware, except the
layer number for ovl_2l is 2 and ovl is 4.
this patch is a preparation for ovl-2l and
ovl share the same driver.

Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com>
---
 drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
index afb313c..a0ab760 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
@@ -60,6 +60,7 @@
 struct mtk_disp_ovl_data {
 	unsigned int addr;
 	unsigned int gmc_bits;
+	unsigned int layer_nr;
 	bool fmt_rgb565_is_0;
 };
 
@@ -137,7 +138,9 @@ static void mtk_ovl_config(struct mtk_ddp_comp *comp, unsigned int w,
 
 static unsigned int mtk_ovl_layer_nr(struct mtk_ddp_comp *comp)
 {
-	return 4;
+	struct mtk_disp_ovl *ovl = comp_to_ovl(comp);
+
+	return ovl->data->layer_nr;
 }
 
 static void mtk_ovl_layer_on(struct mtk_ddp_comp *comp, unsigned int idx)
@@ -342,12 +345,14 @@ static int mtk_disp_ovl_remove(struct platform_device *pdev)
 static const struct mtk_disp_ovl_data mt2701_ovl_driver_data = {
 	.addr = DISP_REG_OVL_ADDR_MT2701,
 	.gmc_bits = 8,
+	.layer_nr = 4,
 	.fmt_rgb565_is_0 = false,
 };
 
 static const struct mtk_disp_ovl_data mt8173_ovl_driver_data = {
 	.addr = DISP_REG_OVL_ADDR_MT8173,
 	.gmc_bits = 8,
+	.layer_nr = 4,
 	.fmt_rgb565_is_0 = true,
 };
 
-- 
1.8.1.1.dirty


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2019-03-27  6:19 UTC|newest]

Thread overview: 159+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-27  6:18 [PATCH v2 00/25] add drm support for MT8183 yongqiang.niu
2019-03-27  6:18 ` yongqiang.niu
2019-03-27  6:18 ` yongqiang.niu
2019-03-27  6:18 ` [PATCH v2 01/25] arm64: dts: add display nodes for mt8183 yongqiang.niu
2019-03-27  6:18   ` yongqiang.niu
2019-03-27  6:18   ` yongqiang.niu
2019-03-28  3:18   ` CK Hu
2019-03-28  3:18     ` CK Hu
2019-03-28  3:18     ` CK Hu
2019-03-27  6:18 ` [PATCH v2 02/25] dt-bindings: mediatek: add binding for mt8183 display yongqiang.niu
2019-03-27  6:18   ` yongqiang.niu
2019-03-27  6:18   ` yongqiang.niu
2019-03-27  9:39   ` CK Hu
2019-03-27  9:39     ` CK Hu
2019-03-27  9:39     ` CK Hu
2019-03-31  6:42   ` Rob Herring
2019-03-31  6:42     ` Rob Herring
2019-03-31  6:42     ` Rob Herring
2019-03-27  6:18 ` [PATCH v2 03/25] drm/mediatek: add mutex mod into ddp private data yongqiang.niu
2019-03-27  6:18   ` yongqiang.niu
2019-03-27  6:18   ` yongqiang.niu-NuS5LvNUpcJWk0Htik3J/w
2019-03-28  1:33   ` CK Hu
2019-03-28  1:33     ` CK Hu
2019-03-28  1:33     ` CK Hu
2019-03-27  6:19 ` [PATCH v2 04/25] drm/mediatek: add mutex sof " yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu-NuS5LvNUpcJWk0Htik3J/w
2019-03-28  3:02   ` CK Hu
2019-03-28  3:02     ` CK Hu
2019-03-28  3:02     ` CK Hu
2019-03-27  6:19 ` [PATCH v2 05/25] drm/mediatek: split DISP_REG_CONFIG_DSI_SEL setting into another use case yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-28  3:37   ` CK Hu
2019-03-28  3:37     ` CK Hu
2019-03-28  3:37     ` CK Hu
2019-03-27  6:19 ` [PATCH v2 06/25] drm/mediatek: redefine mtk_ddp_sout_sel yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-04-11  6:09   ` CK Hu
2019-04-11  6:09     ` CK Hu
2019-04-11  6:09     ` CK Hu
2019-03-27  6:19 ` [PATCH v2 07/25] drm/mediatek: move rdma sout from mtk_ddp_mout_en into mtk_ddp_sout_sel yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-04-11  5:30   ` CK Hu
2019-04-11  5:30     ` CK Hu
2019-04-11  5:30     ` CK Hu
2019-03-27  6:19 ` [PATCH v2 08/25] drm/mediatek: add ddp component CCORR yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-04-11  5:57   ` CK Hu
2019-04-11  5:57     ` CK Hu
2019-04-11  5:57     ` CK Hu
2019-03-27  6:19 ` [PATCH v2 09/25] drm/mediatek: add mmsys private data for ddp path config yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-04-11 10:42   ` CK Hu
2019-04-11 10:42     ` CK Hu
2019-04-11 10:42     ` CK Hu
2019-03-27  6:19 ` [PATCH v2 10/25] drm/mediatek: add commponent OVL0_2L yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-04-11  6:14   ` CK Hu
2019-04-11  6:14     ` CK Hu
2019-04-11  6:14     ` CK Hu
2019-03-27  6:19 ` [PATCH v2 11/25] drm/mediatek: add component OVL1_2L yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-27  6:19 ` [PATCH v2 12/25] drm/mediatek: add component DITHER yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-04-11  6:28   ` CK Hu
2019-04-11  6:28     ` CK Hu
2019-04-11  6:28     ` CK Hu
2019-03-27  6:19 ` [PATCH v2 13/25] drm/mediatek: add gmc_bits for ovl private data yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-04-11  6:48   ` CK Hu
2019-04-11  6:48     ` CK Hu
2019-04-11  6:48     ` CK Hu
2019-03-27  6:19 ` yongqiang.niu [this message]
2019-03-27  6:19   ` [PATCH v2 14/25] drm/medaitek: add layer_nr " yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-04-11 10:57   ` CK Hu
2019-04-11 10:57     ` CK Hu
2019-04-11 10:57     ` CK Hu
2019-03-27  6:19 ` [PATCH v2 15/25] drm/mediatek: add function to background color input select for ovl/ovl_2l direct link yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-04-11 11:01   ` CK Hu
2019-04-11 11:01     ` CK Hu
2019-04-11 11:01     ` CK Hu
2019-03-27  6:19 ` [PATCH v2 16/25] drm/mediatek: add ddp write register common api yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-04-11 11:15   ` CK Hu
2019-04-11 11:15     ` CK Hu
2019-04-11 11:15     ` CK Hu
2019-03-27  6:19 ` [PATCH v2 17/25] drm/mediatek: add background color input select function for ovl/ovl_2l yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-04-16  7:38   ` CK Hu
2019-04-16  7:38     ` CK Hu
2019-04-16  7:38     ` CK Hu
2019-03-27  6:19 ` [PATCH v2 18/25] drm/mediatek: add RDMA fifo size error handle yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-04-16  8:00   ` CK Hu
2019-04-16  8:00     ` CK Hu
2019-04-16  8:00     ` CK Hu
2019-04-16  8:37     ` Yongqiang Niu
2019-04-16  8:37       ` Yongqiang Niu
2019-04-16  8:37       ` Yongqiang Niu
2019-04-16 11:31       ` YT Shen
2019-04-16 11:31         ` YT Shen
2019-04-16 11:31         ` YT Shen
2019-03-27  6:19 ` [PATCH v2 19/25] drm/mediatek: add function mtk_ddp_comp_get_type yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-27  6:19 ` [PATCH v2 20/25] drm/mediatek: add ovl0/ovl0_2l usecase yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-04-16  8:20   ` CK Hu
2019-04-16  8:20     ` CK Hu
2019-04-16  8:20     ` CK Hu
2019-03-27  6:19 ` [PATCH v2 21/25] drm/mediatek: add support for mediatek SOC MT8183 yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-04-11 10:33   ` CK Hu
2019-04-11 10:33     ` CK Hu
2019-04-11 10:33     ` CK Hu
2019-03-27  6:19 ` [PATCH v2 22/25] drm/mediatek: adjust ddp clock control flow yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-04-16  8:24   ` CK Hu
2019-04-16  8:24     ` CK Hu
2019-04-16  8:24     ` CK Hu
2019-05-28  5:35     ` CK Hu
2019-05-28  5:35       ` CK Hu
2019-05-28  5:35       ` CK Hu
2019-03-27  6:19 ` [PATCH v2 23/25] drm/mediatek: add vmap support for mediatek drm yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-04-16  8:30   ` CK Hu
2019-04-16  8:30     ` CK Hu
2019-04-16  8:30     ` CK Hu
2019-03-27  6:19 ` [PATCH v2 24/25] drm/mediatek: respect page offset for PRIME mmap calls yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-04-16  8:33   ` CK Hu
2019-04-16  8:33     ` CK Hu
2019-04-16  8:33     ` CK Hu
2019-05-28  5:35     ` CK Hu
2019-05-28  5:35       ` CK Hu
2019-05-28  5:35       ` CK Hu
2019-03-27  6:19 ` [PATCH v2 25/25] drm/mediatek: enable allow_fb_modifiers for mediatek drm yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu
2019-03-27  6:19   ` yongqiang.niu

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=1553667561-25447-15-git-send-email-yongqiang.niu@mediatek.com \
    --to=yongqiang.niu@mediatek.com \
    --cc=Bibby.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=yt.shen@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.