Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp472409ybi; Tue, 16 Jul 2019 23:48:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqyqgw4gMWbcfbMJgUBwdfIDUNPlhNrMxIhVrL9KaiZ1Ra8MLJD+Rf1pSmClkVW9KuLWj3KA X-Received: by 2002:a17:90a:22c6:: with SMTP id s64mr42751502pjc.5.1563346131321; Tue, 16 Jul 2019 23:48:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563346131; cv=none; d=google.com; s=arc-20160816; b=YlVzeS9m/jxme4JUchPEk2fRYQhvhBGlrVoyA4sLN3Cmi7dZkZqpALYa1q5UvFoIPM /4gmY0UMwjoVe2lJPCU8umTMPZQu5Dslu95lBzeBfwhWKD9KjjfOC26F8mj4j0U+DQx0 xJaUWMjFtZyTVBMGvOeR1nKAr5gWyNdM0b52ZDRF3kqXV0uS8A1ocMueBRnC6v/C2jVW f1y2vNJCXyoJoTPXNOFLQ2gMIOchy+X8A8rf+vBIfe73kZrLH30mpUVaiA8Hm75YB6Xb 8ErS2ymPq+zrwI4zOAOw0EM35bl367jby4Pc/PiLLTuLwaae7DhNAW7pqrmNiVeNfvle 9q/A== 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; bh=k/3cuYkiGq62HSYwQVCoM8LGOuKljz2xWOt7zVFrhNg=; b=zS5DeCMl3qnq901js09qnA2BYIhcRLecSHiZHMDmnr/rC0OCsKFHVLjhAWXfAQ9tSQ ltE/rifRaEIO2FagQzhTE+AK4seY2NtCAmrvuYl/sxQ7Ngca+lDEomTEGnYc0ml+/dnS xSpm9qFvEHNGRyoTQbeVyk9sbSdv4IkLfppYsvx1f0Ud2k70UpE62qN4Df4+soTsAe5E 92b3JzwUcZMFcChGaWCUBG1vQzd31f6FfegtC2Eb3vEHjx8VD3IYmODcNxQQq0YbEnTU TJNq1LtnDHTUSHntF1WzLJeNRpIu8rONmtNpeyztB61MsA6HljkRZne8N/WtS+8zsT/3 IvCQ== 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 e16si16163361pgt.2.2019.07.16.23.48.34; Tue, 16 Jul 2019 23:48:51 -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 S1726072AbfGQGsO (ORCPT + 99 others); Wed, 17 Jul 2019 02:48:14 -0400 Received: from mailgw02.mediatek.com ([1.203.163.81]:21048 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1725892AbfGQGsO (ORCPT ); Wed, 17 Jul 2019 02:48:14 -0400 X-UUID: 8716daf7a3f84bb783c9f74e8c38c9fa-20190717 X-UUID: 8716daf7a3f84bb783c9f74e8c38c9fa-20190717 Received: from mtkcas32.mediatek.inc [(172.27.4.253)] by mailgw02.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLS) with ESMTP id 1771959151; Wed, 17 Jul 2019 14:47:52 +0800 Received: from mtkcas09.mediatek.inc (172.21.101.178) by MTKMBS31DR.mediatek.inc (172.27.6.102) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 17 Jul 2019 14:47:44 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas09.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 17 Jul 2019 14:47:44 +0800 Message-ID: <1563346064.29169.24.camel@mtksdaap41> Subject: Re: [PATCH v4, 23/33] drm/mediatek: add ovl0/ovl_2l0 usecase From: CK Hu To: CC: Philipp Zabel , Rob Herring , Matthias Brugger , "David Airlie" , Daniel Vetter , Mark Rutland , , , , , Date: Wed, 17 Jul 2019 14:47:44 +0800 In-Reply-To: <1562625253-29254-24-git-send-email-yongqiang.niu@mediatek.com> References: <1562625253-29254-1-git-send-email-yongqiang.niu@mediatek.com> <1562625253-29254-24-git-send-email-yongqiang.niu@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-TM-SNTS-SMTP: A5A28C9657D5B5F25C8B81486A932DBAE9B3E8F9A39C0F7D0938311551FCC0742000:8 X-MTK: N Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, Yongqiang: On Tue, 2019-07-09 at 06:34 +0800, yongqiang.niu@mediatek.com wrote: > From: Yongqiang Niu > > This patch add ovl0/ovl_2l0 usecase > in ovl->ovl_2l0 direct link usecase: > 1. the crtc support layer number will 4+2 > 2. ovl_2l0 background color input select ovl0 when crtc init > and disable it when crtc finish > 3. config ovl_2l0 layer, if crtc config layer number is > bigger than ovl0 support layers(max is 4) > > Signed-off-by: Yongqiang Niu > --- > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 38 +++++++++++++++++++++++++++++++-- > 1 file changed, 36 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > index 5eac376..9ee9ce2 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > @@ -282,6 +282,15 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc) > > for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) { > struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[i]; > + enum mtk_ddp_comp_id prev; > + > + if (i > 0) > + prev = mtk_crtc->ddp_comp[i - 1]->id; > + else > + prev = DDP_COMPONENT_ID_MAX; > + > + if (prev == DDP_COMPONENT_OVL0) > + mtk_ddp_comp_bgclr_in_on(comp); I does not like to use a specific component id to check, that is not general. For now, you could simply call mtk_ddp_comp_bgclr_in_on(comp); for all component because only ovl_2l has implemented it. Regards, CK > > mtk_ddp_comp_config(comp, width, height, vrefresh, bpc); > mtk_ddp_comp_start(comp); > @@ -291,9 +300,18 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc) > for (i = 0; i < mtk_crtc->layer_nr; i++) { > struct drm_plane *plane = &mtk_crtc->planes[i]; > struct mtk_plane_state *plane_state; > + struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0]; > + unsigned int comp_layer_nr = mtk_ddp_comp_layer_nr(comp); > + unsigned int local_layer; > > plane_state = to_mtk_plane_state(plane->state); > - mtk_ddp_comp_layer_config(mtk_crtc->ddp_comp[0], i, > + > + if (i >= comp_layer_nr) { > + comp = mtk_crtc->ddp_comp[1]; > + local_layer = i - comp_layer_nr; > + } else > + local_layer = i; > + mtk_ddp_comp_layer_config(comp , local_layer, > plane_state); > } > > @@ -319,6 +337,7 @@ static void mtk_crtc_ddp_hw_fini(struct mtk_drm_crtc *mtk_crtc) > mtk_crtc->ddp_comp[i]->id); > mtk_disp_mutex_disable(mtk_crtc->mutex); > for (i = 0; i < mtk_crtc->ddp_comp_nr - 1; i++) { > + mtk_ddp_comp_bgclr_in_off(mtk_crtc->ddp_comp[i]); > mtk_ddp_remove_comp_from_path(mtk_crtc->config_regs, > mtk_crtc->mmsys_reg_data, > mtk_crtc->ddp_comp[i]->id, > @@ -339,6 +358,8 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc) > struct mtk_crtc_state *state = to_mtk_crtc_state(mtk_crtc->base.state); > struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0]; > unsigned int i; > + unsigned int comp_layer_nr = mtk_ddp_comp_layer_nr(comp); > + unsigned int local_layer; > > /* > * TODO: instead of updating the registers here, we should prepare > @@ -361,7 +382,14 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc) > plane_state = to_mtk_plane_state(plane->state); > > if (plane_state->pending.config) { > - mtk_ddp_comp_layer_config(comp, i, plane_state); > + if (i >= comp_layer_nr) { > + comp = mtk_crtc->ddp_comp[1]; > + local_layer = i - comp_layer_nr; > + } else > + local_layer = i; > + > + mtk_ddp_comp_layer_config(comp, local_layer, > + plane_state); > plane_state->pending.config = false; > } > } > @@ -592,6 +620,12 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, > } > > mtk_crtc->layer_nr = mtk_ddp_comp_layer_nr(mtk_crtc->ddp_comp[0]); > + if (mtk_crtc->ddp_comp_nr > 1) { > + struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[1]; > + > + if (comp->funcs->bgclr_in_on) > + mtk_crtc->layer_nr += mtk_ddp_comp_layer_nr(comp); > + } > mtk_crtc->planes = devm_kcalloc(dev, mtk_crtc->layer_nr, > sizeof(struct drm_plane), > GFP_KERNEL);