From: stu.hsieh@mediatek.com (Stu Hsieh)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 12/14] drm/mediatek: use layer_nr function to get layer number to init plane
Date: Thu, 9 Aug 2018 10:15:47 +0800 [thread overview]
Message-ID: <1533780949-30141-13-git-send-email-stu.hsieh@mediatek.com> (raw)
In-Reply-To: <1533780949-30141-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 | 21 ++++++++++++++-------
drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 1 -
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index 2d6aa150a9ff..845d1608465e 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;
+ 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;
@@ -598,7 +599,12 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
mtk_crtc->ddp_comp[i] = comp;
}
- for (zpos = 0; zpos < OVL_LAYER_NR; zpos++) {
+ mtk_crtc->layer_nr = mtk_ddp_comp_layer_nr(mtk_crtc->ddp_comp[0]);
+ mtk_crtc->planes = devm_kzalloc(dev, mtk_crtc->layer_nr *
+ sizeof(struct drm_plane),
+ GFP_KERNEL);
+
+ 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;
@@ -609,7 +615,8 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
}
ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, &mtk_crtc->planes[0],
- &mtk_crtc->planes[1], pipe);
+ mtk_crtc->layer_nr > 1 ? &mtk_crtc->planes[1] :
+ NULL, 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..60bcc8aba8e3 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
@@ -18,7 +18,6 @@
#include "mtk_drm_ddp_comp.h"
#include "mtk_drm_plane.h"
-#define OVL_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-09 2:15 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-09 2:15 [PATCH v4 00/14] Add RDMA memory mode support for mediatek SOC MT2712 Stu Hsieh
2018-08-09 2:15 ` [PATCH v4 01/14] drm/mediatek: add connection from RDMA0 to DPI1 Stu Hsieh
2018-08-09 2:15 ` [PATCH v4 02/14] drm/mediatek: add connection from RDMA0 to DSI1 Stu Hsieh
2018-08-09 2:15 ` [PATCH v4 03/14] drm/mediatek: add connection from RDMA1 to DSI0 Stu Hsieh
2018-08-09 2:15 ` [PATCH v4 04/14] drm/mediatek: add connection from RDMA2 " Stu Hsieh
2018-08-09 2:15 ` [PATCH v4 05/14] drm/mediatek: add memory mode and layer_config for RDMA Stu Hsieh
2018-08-09 2:15 ` [PATCH v4 06/14] drm/mediatek: add RGB color format support " Stu Hsieh
2018-08-09 2:36 ` CK Hu
2018-08-09 2:15 ` [PATCH v4 07/14] drm/mediatek: add the comment about color format setting for OVL Stu Hsieh
2018-08-09 2:37 ` CK Hu
2018-08-09 2:15 ` [PATCH v4 08/14] drm/mediatek: add YUYV/UYVY color format support for RDMA Stu Hsieh
2018-08-09 2:41 ` CK Hu
2018-08-09 2:15 ` [PATCH v4 09/14] drm/mediatek: add function to get layer number for component Stu Hsieh
2018-08-09 2:15 ` [PATCH v4 10/14] drm/mediatek: add function to return OVL layer number Stu Hsieh
2018-08-09 2:15 ` [PATCH v4 11/14] drm/mediatek: add function to return RDMA " Stu Hsieh
2018-08-09 2:15 ` Stu Hsieh [this message]
2018-08-09 2:46 ` [PATCH v4 12/14] drm/mediatek: use layer_nr function to get layer number to init plane CK Hu
2018-08-09 2:15 ` [PATCH v4 13/14] drm/mediatek: update some variable name from ovl to comp Stu Hsieh
2018-08-09 2:15 ` [PATCH v4 14/14] drm/mediatek: fix connection from RDMA2 to DSI1 Stu Hsieh
2018-08-15 1:55 ` [PATCH v4 00/14] Add RDMA memory mode support for mediatek SOC MT2712 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=1533780949-30141-13-git-send-email-stu.hsieh@mediatek.com \
--to=stu.hsieh@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).