Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp4304249imm; Mon, 6 Aug 2018 22:19:24 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeKaZNOpy7JU7tX2qeKU8N4Q0RItWLYz1AMSz2Fp8Frnt35oG/Ghq/nLPWxCH10gOKIgeo9 X-Received: by 2002:a63:65c2:: with SMTP id z185-v6mr17026473pgb.276.1533619164347; Mon, 06 Aug 2018 22:19:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533619164; cv=none; d=google.com; s=arc-20160816; b=Mte4lsjpudLpJd2h9g4cO10Q8OYH2TbtyB0N1PboJcGUdLqS/PzuzHjBWy0IfdNn20 DQ1nXIyZuqe7SNy7dze49H4nLnyoH9k/+cirkNv3eAM9D84Hed4y+T++SapYQZLn4TU9 qo4XDvv/57F1fGtcMLAV+1ET8+0OTCSoyyesCNymGnN/2hfSZDyPCBCyASDJ9pmljqqI iM1nYiblJPuUHFMTzz11WR0n4LjNMI9njyLZhDdSyMZ+8b1N2I6YZwjwZSFcUAlQjkyy /Cor+OPgQBhXRIphn6XhBxSBOsFM3fLbTI0/7L8Nrf/fSBiLjlwmGX2oSXGd0eVImUtf jasA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:date:cc:to:from:subject:message-id :arc-authentication-results; bh=15kEmxwzMY7PRUpOEY25MB5BPqtZ3Skz16yY4w0N8y4=; b=EqMYX+VAlfp8eb8WWZ5GvF6Yk3feigHfHSB2Qh+U7bNXob0/3vu85sc+EABgT0aYPv 4DRTK+PKfVoAf5YmGO/i4OfNWEbMZUE1cg1vOTaivHvSNuLLL9wUVRMR04OHq/qAl+DT VyK6DySUw7b+XjwCzUrCnpxSY/V0pDKkcUxX/Ko9UZkDa8F6Y3d1q7abMGpxfKcdxT0b GTG6UBRtothYoiGGOBBh8ua3LwC8eoTBM+MceQQtk1YPA9/vDoD8eEmSmHJfIDJphfQY n6MpP3XrY7cpkHXQgVBPAiXrO39OkDoc/Ezh6v6ybML/OAPd7opsh6h0+XqNLKTRHrd5 mpSA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t67-v6si389521pfd.364.2018.08.06.22.19.09; Mon, 06 Aug 2018 22:19:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729824AbeHGGoo (ORCPT + 99 others); Tue, 7 Aug 2018 02:44:44 -0400 Received: from mailgw01.mediatek.com ([210.61.82.183]:64019 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726918AbeHGGoo (ORCPT ); Tue, 7 Aug 2018 02:44:44 -0400 X-UUID: 08f9b068296942db9be16217c914fa4e-20180807 Received: from mtkcas09.mediatek.inc [(172.21.101.178)] by mailgw01.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 2080656; Tue, 07 Aug 2018 12:32:13 +0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs03n2.mediatek.inc (172.21.101.182) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Tue, 7 Aug 2018 12:32:11 +0800 Received: from [172.21.77.4] (172.21.77.4) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1210.3 via Frontend Transport; Tue, 7 Aug 2018 12:32:11 +0800 Message-ID: <1533616331.22668.15.camel@mtksdaap41> Subject: Re: [PATCH v3 11/13] drm/mediatek: use layer_nr function to get layer number to init plane From: CK Hu To: Stu Hsieh CC: Philipp Zabel , David Airlie , Matthias Brugger , , , , , Date: Tue, 7 Aug 2018 12:32:11 +0800 In-Reply-To: <1533556700-26525-12-git-send-email-stu.hsieh@mediatek.com> References: <1533556700-26525-1-git-send-email-stu.hsieh@mediatek.com> <1533556700-26525-12-git-send-email-stu.hsieh@mediatek.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-MTK: N Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, Stu: On Mon, 2018-08-06 at 19:58 +0800, Stu Hsieh wrote: > 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 > --- > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 37 +++++++++++++++++++++------------ > drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 1 - > 2 files changed, 24 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > index 2d6aa150a9ff..1a8685fbbf57 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; Why double pointer? This make things more complicated. Single pointer is equal to array, so you need not to modify so many place. Regards, CK > + unsigned int layer_nr; > bool pending_planes; > > void __iomem *config_regs; > @@ -286,8 +287,8 @@ 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++) { > - struct drm_plane *plane = &mtk_crtc->planes[i]; > + for (i = 0; i < mtk_crtc->layer_nr; i++) { > + struct drm_plane *plane = mtk_crtc->planes[i]; > struct mtk_plane_state *plane_state; > > plane_state = to_mtk_plane_state(plane->state); > @@ -351,8 +352,8 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc) > } > > if (mtk_crtc->pending_planes) { > - for (i = 0; i < OVL_LAYER_NR; i++) { > - struct drm_plane *plane = &mtk_crtc->planes[i]; > + for (i = 0; i < mtk_crtc->layer_nr; i++) { > + struct drm_plane *plane = mtk_crtc->planes[i]; > struct mtk_plane_state *plane_state; > > plane_state = to_mtk_plane_state(plane->state); > @@ -403,8 +404,8 @@ 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++) { > - struct drm_plane *plane = &mtk_crtc->planes[i]; > + for (i = 0; i < mtk_crtc->layer_nr; i++) { > + struct drm_plane *plane = mtk_crtc->planes[i]; > struct mtk_plane_state *plane_state; > > plane_state = to_mtk_plane_state(plane->state); > @@ -450,8 +451,8 @@ 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++) { > - struct drm_plane *plane = &mtk_crtc->planes[i]; > + for (i = 0; i < mtk_crtc->layer_nr; i++) { > + struct drm_plane *plane = mtk_crtc->planes[i]; > struct mtk_plane_state *plane_state; > > plane_state = to_mtk_plane_state(plane->state); > @@ -598,18 +599,28 @@ 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_kmalloc_array(dev, mtk_crtc->layer_nr, > + sizeof(*mtk_crtc->planes), > + GFP_KERNEL); > + > + for (zpos = 0; zpos < mtk_crtc->layer_nr; zpos++) { > + mtk_crtc->planes[zpos] = devm_kzalloc(dev, > + sizeof(*mtk_crtc->planes[zpos]), > + GFP_KERNEL); > + > type = (zpos == 0) ? DRM_PLANE_TYPE_PRIMARY : > (zpos == 1) ? DRM_PLANE_TYPE_CURSOR : > DRM_PLANE_TYPE_OVERLAY; > - ret = mtk_plane_init(drm_dev, &mtk_crtc->planes[zpos], > + ret = mtk_plane_init(drm_dev, mtk_crtc->planes[zpos], > BIT(pipe), type); > if (ret) > goto unprepare; > } > > - ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, &mtk_crtc->planes[0], > - &mtk_crtc->planes[1], pipe); > + ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, mtk_crtc->planes[0], > + 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