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>,
Matthias Brugger <matthias.bgg@gmail.com>,
<dri-devel@lists.freedesktop.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <srv_heupstream@mediatek.com>,
Stu Hsieh <stu.hsieh@mediatek.com>
Subject: [PATCH v2 13/15] drm/mediatek: use layer_nr function to get layer number to init plane
Date: Fri, 3 Aug 2018 11:11:06 +0800 [thread overview]
Message-ID: <1533265868-28110-14-git-send-email-stu.hsieh@mediatek.com> (raw)
In-Reply-To: <1533265868-28110-1-git-send-email-stu.hsieh@mediatek.com>
This patch use layer_nr function to get layer number to init plane
When plane init in crtc create,
it use the number of OVL layer to init plane.
That's OVL can read 4 memory address.
For mt2712 third ddp, it use RDMA to read memory.
RDMA can read 1 memory address, so it just init one plane.
For compatibility, this patch use mtk_ddp_comp_layer_nr function
to get layer number from their HW component in ddp for plane init.
Signed-off-by: Stu Hsieh <stu.hsieh@mediatek.com>
---
drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 26 ++++++++++++++++++--------
drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 2 +-
2 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index 4bf636e466f2..b4d3dfca4003 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -45,7 +45,8 @@ struct mtk_drm_crtc {
bool pending_needs_vblank;
struct drm_pending_vblank_event *event;
- struct drm_plane planes[OVL_LAYER_NR];
+ struct drm_plane planes[MAX_LAYER_NR];
+ unsigned int layer_nr;
bool pending_planes;
void __iomem *config_regs;
@@ -286,7 +287,7 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc)
}
/* Initially configure all planes */
- for (i = 0; i < OVL_LAYER_NR; i++) {
+ for (i = 0; i < mtk_crtc->layer_nr; i++) {
struct drm_plane *plane = &mtk_crtc->planes[i];
struct mtk_plane_state *plane_state;
@@ -351,7 +352,7 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc)
}
if (mtk_crtc->pending_planes) {
- for (i = 0; i < OVL_LAYER_NR; i++) {
+ for (i = 0; i < mtk_crtc->layer_nr; i++) {
struct drm_plane *plane = &mtk_crtc->planes[i];
struct mtk_plane_state *plane_state;
@@ -403,7 +404,7 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,
return;
/* Set all pending plane state to disabled */
- for (i = 0; i < OVL_LAYER_NR; i++) {
+ for (i = 0; i < mtk_crtc->layer_nr; i++) {
struct drm_plane *plane = &mtk_crtc->planes[i];
struct mtk_plane_state *plane_state;
@@ -450,7 +451,7 @@ static void mtk_drm_crtc_atomic_flush(struct drm_crtc *crtc,
if (mtk_crtc->event)
mtk_crtc->pending_needs_vblank = true;
- for (i = 0; i < OVL_LAYER_NR; i++) {
+ for (i = 0; i < mtk_crtc->layer_nr; i++) {
struct drm_plane *plane = &mtk_crtc->planes[i];
struct mtk_plane_state *plane_state;
@@ -596,6 +597,9 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
goto unprepare;
}
+ if (i == 0)
+ mtk_crtc->layer_nr = mtk_ddp_comp_layer_nr(comp);
+
if (i == 0 && (comp_id == DDP_COMPONENT_RDMA0 ||
comp_id == DDP_COMPONENT_RDMA1 ||
comp_id == DDP_COMPONENT_RDMA2)) {
@@ -606,7 +610,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
mtk_crtc->ddp_comp[i] = comp;
}
- for (zpos = 0; zpos < OVL_LAYER_NR; zpos++) {
+ for (zpos = 0; zpos < mtk_crtc->layer_nr; zpos++) {
type = (zpos == 0) ? DRM_PLANE_TYPE_PRIMARY :
(zpos == 1) ? DRM_PLANE_TYPE_CURSOR :
DRM_PLANE_TYPE_OVERLAY;
@@ -616,8 +620,14 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
goto unprepare;
}
- ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, &mtk_crtc->planes[0],
- &mtk_crtc->planes[1], pipe);
+ if (mtk_crtc->layer_nr == 1) {
+ ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, &mtk_crtc->planes[0],
+ NULL, pipe);
+ } else {
+ ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, &mtk_crtc->planes[0],
+ &mtk_crtc->planes[1], pipe);
+ }
+
if (ret < 0)
goto unprepare;
drm_mode_crtc_set_gamma_size(&mtk_crtc->base, MTK_LUT_SIZE);
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
index 9d9410c67ae9..0399321b1414 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
@@ -18,7 +18,7 @@
#include "mtk_drm_ddp_comp.h"
#include "mtk_drm_plane.h"
-#define OVL_LAYER_NR 4
+#define MAX_LAYER_NR 4
#define MTK_LUT_SIZE 512
#define MTK_MAX_BPC 10
#define MTK_MIN_BPC 3
--
2.12.5.2.gbdf23ab
next prev parent reply other threads:[~2018-08-03 3:11 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-03 3:10 [PATCH v2 00/15] Add RDMA memory mode support for mediatek SOC MT2712 Stu Hsieh
2018-08-03 3:10 ` [PATCH v2 01/15] drm/mediatek: add connection from RDMA0 to DPI1 Stu Hsieh
2018-08-03 4:57 ` CK Hu
2018-08-03 3:10 ` [PATCH v2 02/15] drm/mediatek: add connection from RDMA0 to DSI1 Stu Hsieh
2018-08-03 4:58 ` CK Hu
2018-08-03 3:10 ` [PATCH v2 03/15] drm/mediatek: add connection from RDMA1 to DSI0 Stu Hsieh
2018-08-03 5:00 ` CK Hu
2018-08-03 3:10 ` [PATCH v2 04/15] drm/mediatek: add connection from RDMA2 " Stu Hsieh
2018-08-03 5:01 ` CK Hu
2018-08-03 3:10 ` [PATCH v2 05/15] drm/mediatek: add RDMA memory mode for crtc created Stu Hsieh
2018-08-03 3:10 ` [PATCH v2 06/15] drm/mediatek: add memory mode for RDMA Stu Hsieh
2018-08-03 3:11 ` [PATCH v2 07/15] drm/mediatek: add layer config to set RDMA for plane setting Stu Hsieh
2018-08-03 3:11 ` [PATCH v2 08/15] drm/mediatek: add RGB color format support for RDMA Stu Hsieh
2018-08-03 3:11 ` [PATCH v2 09/15] drm/mediatek: add YUYV/UYVY " Stu Hsieh
2018-08-03 3:11 ` [PATCH v2 10/15] drm/mediatek: add function to get layer number for component Stu Hsieh
2018-08-03 5:08 ` CK Hu
2018-08-03 3:11 ` [PATCH v2 11/15] drm/mediatek: add callback function to return OVL layer number Stu Hsieh
2018-08-03 5:11 ` CK Hu
2018-08-06 11:54 ` Stu Hsieh
2018-08-03 3:11 ` [PATCH v2 12/15] drm/mediatek: add callback function to return RDMA " Stu Hsieh
2018-08-03 5:13 ` CK Hu
2018-08-06 11:53 ` Stu Hsieh
2018-08-03 3:11 ` Stu Hsieh [this message]
2018-08-03 5:33 ` [PATCH v2 13/15] drm/mediatek: use layer_nr function to get layer number to init plane CK Hu
2018-08-06 11:55 ` Stu Hsieh
2018-08-03 3:11 ` [PATCH v2 14/15] drm/mediatek: update some variable name from ovl to comp Stu Hsieh
2018-08-03 5:34 ` CK Hu
2018-08-03 3:11 ` [PATCH v2 15/15] drm/mediatek: fix connection from RDMA2 to DSI1 Stu Hsieh
2018-08-03 5:36 ` 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=1533265868-28110-14-git-send-email-stu.hsieh@mediatek.com \
--to=stu.hsieh@mediatek.com \
--cc=airlied@linux.ie \
--cc=ck.hu@mediatek.com \
--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=matthias.bgg@gmail.com \
--cc=p.zabel@pengutronix.de \
--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).