From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32C08C433EF for ; Fri, 17 Jun 2022 05:23:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1380033AbiFQFXk (ORCPT ); Fri, 17 Jun 2022 01:23:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1380104AbiFQFXi (ORCPT ); Fri, 17 Jun 2022 01:23:38 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B62911839C for ; Thu, 16 Jun 2022 22:23:30 -0700 (PDT) X-UUID: 8db5ea7a49ef4ee68c53ba864463702c-20220617 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.6,REQID:615d91a7-f42e-4485-9bb6-a548c0d6a956,OB:10,L OB:0,IP:0,URL:0,TC:0,Content:0,EDM:0,RT:0,SF:45,FILE:0,RULE:Release_Ham,AC TION:release,TS:45 X-CID-INFO: VERSION:1.1.6,REQID:615d91a7-f42e-4485-9bb6-a548c0d6a956,OB:10,LOB :0,IP:0,URL:0,TC:0,Content:0,EDM:0,RT:0,SF:45,FILE:0,RULE:Release_Ham,ACTI ON:release,TS:45 X-CID-META: VersionHash:b14ad71,CLOUDID:dbf2da48-4c92-421c-ad91-b806c0f58b2a,C OID:5e76de18f4ea,Recheck:0,SF:28|17|19|48,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,QS:nil,BEC:nil,COL:0 X-UUID: 8db5ea7a49ef4ee68c53ba864463702c-20220617 Received: from mtkcas11.mediatek.inc [(172.21.101.40)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1705269823; Fri, 17 Jun 2022 13:23:23 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.15; Fri, 17 Jun 2022 13:23:22 +0800 Received: from mtksdccf07 (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 17 Jun 2022 13:23:21 +0800 Message-ID: <81d35568f1caf58f420704f504bf78b7182c9975.camel@mediatek.com> Subject: Re: [PATCH] drm/mediatek: fix crtc index computation From: CK Hu To: Fabien Parent , Chun-Kuang Hu , Philipp Zabel , "David Airlie" , Daniel Vetter , "Matthias Brugger" CC: , , , Date: Fri, 17 Jun 2022 13:23:21 +0800 In-Reply-To: <20220530142407.781187-1-fparent@baylibre.com> References: <20220530142407.781187-1-fparent@baylibre.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, Fabien: On Mon, 2022-05-30 at 16:24 +0200, Fabien Parent wrote: > The code always assume that the main path is enabled, which is not > always the case. When the main path is not enabled, the CRTC index > of the ext path is incorrect which makes the secondary path > not usable. Fix the CRTC index calculation. > > Signed-off-by: Fabien Parent > --- > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 46 +++++++++++++++-- > ---- > 1 file changed, 34 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > index 5d7504a72b11..6f2abfc608fb 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > @@ -430,25 +430,47 @@ int mtk_ddp_comp_get_id(struct device_node > *node, > return -EINVAL; > } > > +static bool mtk_drm_comp_is_enabled(struct drm_device *drm, > + const enum mtk_ddp_comp_id *path, > + unsigned int path_len) > +{ > + struct mtk_drm_private *priv = drm->dev_private; > + > + return path && path_len && !!priv->comp_node[path[path_len - > 1]]; Why just check priv->comp_node[path[path_len - 1]]? In mtk_drm_crtc_create(), crtc would not be created if any comp node in the path is null. Regards, CK > +} > + > unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device > *drm, > struct device *dev) > { > struct mtk_drm_private *private = drm->dev_private; > - unsigned int ret = 0; > + unsigned int index = 0; > > - if (mtk_drm_find_comp_in_ddp(dev, private->data->main_path, > private->data->main_len, > + if (mtk_drm_find_comp_in_ddp(dev, private->data->main_path, > + private->data->main_len, > private->ddp_comp)) > - ret = BIT(0); > - else if (mtk_drm_find_comp_in_ddp(dev, private->data->ext_path, > - private->data->ext_len, > private->ddp_comp)) > - ret = BIT(1); > - else if (mtk_drm_find_comp_in_ddp(dev, private->data- > >third_path, > - private->data->third_len, > private->ddp_comp)) > - ret = BIT(2); > - else > - DRM_INFO("Failed to find comp in ddp table\n"); > + return BIT(index); > + > + if (mtk_drm_comp_is_enabled(drm, private->data->main_path, > + private->data->main_len)) > + index++; > > - return ret; > + if (mtk_drm_find_comp_in_ddp(dev, private->data->ext_path, > + private->data->ext_len, > + private->ddp_comp)) > + return BIT(index); > + > + if (mtk_drm_comp_is_enabled(drm, private->data->ext_path, > + private->data->ext_len)) > + index++; > + > + if (mtk_drm_find_comp_in_ddp(dev, private->data->third_path, > + private->data->third_len, > + private->ddp_comp)) > + return BIT(index); > + > + DRM_INFO("Failed to find comp in ddp table\n"); > + > + return 0; > } > > int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp > *comp,