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 X-Spam-Level: X-Spam-Status: No, score=-13.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_SANE_2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 668FBC352A4 for ; Mon, 10 Feb 2020 02:53:23 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3C9682086A for ; Mon, 10 Feb 2020 02:53:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="dO4ZlCx6"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="Lae74vM2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3C9682086A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=CRgRFQIO1QUZBYbTMV4pS7FZk7KFLynp0tq2Dggxw+A=; b=dO4ZlCx62uHlbN lrlfPi8OYzSxDJQQ9oHoy7D7fNviXuoK/VQtzRON2b8ubHur++ZfKPWc6Of45UqGDXm9m6y/tFZR8 1h9cxpgrry6Actpv3UVrZTXnLhds9i0nQsewdXoCQxeujmNlf9m8jeg6MNdR85vJuUGhJeAWV5vxB rnqvdWiAtg2aDFsh/H+RQY4nmv/tvPDGXnYafxJ6DHRqUMpUglKxU6U9NgV+e6ygv8jl8MnnQYP6F cK2s+eA/EpxuT5y2Hx0p9brR5pNvIpnPNPsQ4tZ+Bh+6SlMlNdYm/z1k4YDNBLUlielrjMOHRFI9U elKvtWMqwo4i/RuHMfLg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j0zCF-0006kX-Oj; Mon, 10 Feb 2020 02:53:15 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j0zCD-0006k5-5a; Mon, 10 Feb 2020 02:53:14 +0000 X-UUID: cd411884028c4fb082d5d1214dda46e7-20200209 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=W9H3gUT21gGxakLPlN7C+OdzFLN/Tl44T7eG40NyIp0=; b=Lae74vM2lIGTQnPzJo/fh/ko34RNSZ4n9XoVN6pkcEpVpsT8Ii2WMVvVkuXVdCpP9TvwJ+CWzxE2MbQJML09lHlOdQvbVglMlbQAJ7F4sD/CvODLq3Rk+MxiTpMuIMSb5vg2EWrkxHetweCevm8ifcFM4eJoclnBBGmRgkvvK8E=; X-UUID: cd411884028c4fb082d5d1214dda46e7-20200209 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1799714164; Sun, 09 Feb 2020 18:53:10 -0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Sun, 9 Feb 2020 18:53:13 -0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkcas07.mediatek.inc (172.21.101.84) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 10 Feb 2020 10:52:18 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Mon, 10 Feb 2020 10:53:24 +0800 Message-ID: <1581303187.951.2.camel@mtksdaap41> Subject: Re: [PATCH] drm/mediatek: Find the cursor plane instead of hard coding it From: CK Hu To: Evan Benn Date: Mon, 10 Feb 2020 10:53:07 +0800 In-Reply-To: <1581064499.590.0.camel@mtksdaap41> References: <20200206140140.GA18465@art_vandelay> <20200207152348.1.Ie0633018fc787dda6e869cae23df76ae30f2a686@changeid> <1581064499.590.0.camel@mtksdaap41> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200209_185313_212631_F840428E X-CRM114-Status: GOOD ( 13.88 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, Philipp Zabel , Matthias Brugger , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Hi, Evan: On Fri, 2020-02-07 at 16:34 +0800, CK Hu wrote: > Hi, Evan: > > On Fri, 2020-02-07 at 15:23 +1100, Evan Benn wrote: > > The cursor and primary planes were hard coded. > > Now search for them for passing to drm_crtc_init_with_planes > > > > Reviewed-by: CK Hu Applied to mediatek-drm-fixes-5.6 [1], thanks. [1] https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-fixes-5.6 Regards, CK > > > Signed-off-by: Evan Benn > > --- > > > > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 18 ++++++++++++------ > > 1 file changed, 12 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > > index 7b392d6c71cc..935652990afa 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > > @@ -658,10 +658,18 @@ static const struct drm_crtc_helper_funcs mtk_crtc_helper_funcs = { > > > > static int mtk_drm_crtc_init(struct drm_device *drm, > > struct mtk_drm_crtc *mtk_crtc, > > - struct drm_plane *primary, > > - struct drm_plane *cursor, unsigned int pipe) > > + unsigned int pipe) > > { > > - int ret; > > + struct drm_plane *primary = NULL; > > + struct drm_plane *cursor = NULL; > > + int i, ret; > > + > > + for (i = 0; i < mtk_crtc->layer_nr; i++) { > > + if (mtk_crtc->planes[i].type == DRM_PLANE_TYPE_PRIMARY) > > + primary = &mtk_crtc->planes[i]; > > + else if (mtk_crtc->planes[i].type == DRM_PLANE_TYPE_CURSOR) > > + cursor = &mtk_crtc->planes[i]; > > + } > > > > ret = drm_crtc_init_with_planes(drm, &mtk_crtc->base, primary, cursor, > > &mtk_crtc_funcs, NULL); > > @@ -830,9 +838,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, > > return ret; > > } > > > > - ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, &mtk_crtc->planes[0], > > - mtk_crtc->layer_nr > 1 ? &mtk_crtc->planes[1] : > > - NULL, pipe); > > + ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, pipe); > > if (ret < 0) > > return ret; > > > _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek 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 X-Spam-Level: X-Spam-Status: No, score=-13.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_SANE_2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 569BEC2BA83 for ; Mon, 10 Feb 2020 02:53:22 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2B1E3208C4 for ; Mon, 10 Feb 2020 02:53:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Bs8IUgHf"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="Lae74vM2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2B1E3208C4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=gTzO3+Kh1a4yF0xW8Kj7f7mNQHMGWg6C1MtJhHd3Ljk=; b=Bs8IUgHfHEEvvv xb9hqe4jK6++ExVjRmsP6wELlmS+p/k6x8eC7XVdyKAnCNZ9rY2/2aGET+3y0ULe71k5olJ7DBVNa ITm1CfR02GlXtyKHI1sGflvMgzRUd62KVYseKhYQOxikKIMDs8wh6MM88gOl1WC31yHDeOQ20iIgY wBreeDrI4WzgrOQgaMvSyAJzZDQffP12D91DAAPwHgymEJUzXaRv/fIIx5LC82OJx/XTK0UGorlXh j3EgIh/+gez6oUGS/sOdqJoFLupJzhm/SNoLGDyVszVha/kfZ18a1BcnCS3Ekmsewvp75c2j/KJz4 Rk9FknrnV3FfIv/3SyBA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j0zCG-0006lH-H6; Mon, 10 Feb 2020 02:53:16 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j0zCD-0006k5-5a; Mon, 10 Feb 2020 02:53:14 +0000 X-UUID: cd411884028c4fb082d5d1214dda46e7-20200209 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=W9H3gUT21gGxakLPlN7C+OdzFLN/Tl44T7eG40NyIp0=; b=Lae74vM2lIGTQnPzJo/fh/ko34RNSZ4n9XoVN6pkcEpVpsT8Ii2WMVvVkuXVdCpP9TvwJ+CWzxE2MbQJML09lHlOdQvbVglMlbQAJ7F4sD/CvODLq3Rk+MxiTpMuIMSb5vg2EWrkxHetweCevm8ifcFM4eJoclnBBGmRgkvvK8E=; X-UUID: cd411884028c4fb082d5d1214dda46e7-20200209 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1799714164; Sun, 09 Feb 2020 18:53:10 -0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Sun, 9 Feb 2020 18:53:13 -0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkcas07.mediatek.inc (172.21.101.84) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 10 Feb 2020 10:52:18 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Mon, 10 Feb 2020 10:53:24 +0800 Message-ID: <1581303187.951.2.camel@mtksdaap41> Subject: Re: [PATCH] drm/mediatek: Find the cursor plane instead of hard coding it From: CK Hu To: Evan Benn Date: Mon, 10 Feb 2020 10:53:07 +0800 In-Reply-To: <1581064499.590.0.camel@mtksdaap41> References: <20200206140140.GA18465@art_vandelay> <20200207152348.1.Ie0633018fc787dda6e869cae23df76ae30f2a686@changeid> <1581064499.590.0.camel@mtksdaap41> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200209_185313_212631_F840428E X-CRM114-Status: GOOD ( 13.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, Philipp Zabel , Matthias Brugger , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, Evan: On Fri, 2020-02-07 at 16:34 +0800, CK Hu wrote: > Hi, Evan: > > On Fri, 2020-02-07 at 15:23 +1100, Evan Benn wrote: > > The cursor and primary planes were hard coded. > > Now search for them for passing to drm_crtc_init_with_planes > > > > Reviewed-by: CK Hu Applied to mediatek-drm-fixes-5.6 [1], thanks. [1] https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-fixes-5.6 Regards, CK > > > Signed-off-by: Evan Benn > > --- > > > > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 18 ++++++++++++------ > > 1 file changed, 12 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > > index 7b392d6c71cc..935652990afa 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > > @@ -658,10 +658,18 @@ static const struct drm_crtc_helper_funcs mtk_crtc_helper_funcs = { > > > > static int mtk_drm_crtc_init(struct drm_device *drm, > > struct mtk_drm_crtc *mtk_crtc, > > - struct drm_plane *primary, > > - struct drm_plane *cursor, unsigned int pipe) > > + unsigned int pipe) > > { > > - int ret; > > + struct drm_plane *primary = NULL; > > + struct drm_plane *cursor = NULL; > > + int i, ret; > > + > > + for (i = 0; i < mtk_crtc->layer_nr; i++) { > > + if (mtk_crtc->planes[i].type == DRM_PLANE_TYPE_PRIMARY) > > + primary = &mtk_crtc->planes[i]; > > + else if (mtk_crtc->planes[i].type == DRM_PLANE_TYPE_CURSOR) > > + cursor = &mtk_crtc->planes[i]; > > + } > > > > ret = drm_crtc_init_with_planes(drm, &mtk_crtc->base, primary, cursor, > > &mtk_crtc_funcs, NULL); > > @@ -830,9 +838,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, > > return ret; > > } > > > > - ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, &mtk_crtc->planes[0], > > - mtk_crtc->layer_nr > 1 ? &mtk_crtc->planes[1] : > > - NULL, pipe); > > + ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, pipe); > > if (ret < 0) > > return ret; > > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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 X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78077C2BA83 for ; Mon, 10 Feb 2020 02:53:14 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 487AD2086A for ; Mon, 10 Feb 2020 02:53:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="Lae74vM2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 487AD2086A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C7FF16E10E; Mon, 10 Feb 2020 02:53:13 +0000 (UTC) Received: from mailgw01.mediatek.com (unknown [210.61.82.183]) by gabe.freedesktop.org (Postfix) with ESMTP id 039496E10E for ; Mon, 10 Feb 2020 02:53:11 +0000 (UTC) X-UUID: 669d501fcfcc4530a26b11203217b0ac-20200210 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=W9H3gUT21gGxakLPlN7C+OdzFLN/Tl44T7eG40NyIp0=; b=Lae74vM2lIGTQnPzJo/fh/ko34RNSZ4n9XoVN6pkcEpVpsT8Ii2WMVvVkuXVdCpP9TvwJ+CWzxE2MbQJML09lHlOdQvbVglMlbQAJ7F4sD/CvODLq3Rk+MxiTpMuIMSb5vg2EWrkxHetweCevm8ifcFM4eJoclnBBGmRgkvvK8E=; X-UUID: 669d501fcfcc4530a26b11203217b0ac-20200210 Received: from mtkcas07.mediatek.inc [(172.21.101.84)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 77091319; Mon, 10 Feb 2020 10:53:08 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs07n2.mediatek.inc (172.21.101.141) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 10 Feb 2020 10:52:25 +0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkcas07.mediatek.inc (172.21.101.84) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 10 Feb 2020 10:52:18 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Mon, 10 Feb 2020 10:53:24 +0800 Message-ID: <1581303187.951.2.camel@mtksdaap41> Subject: Re: [PATCH] drm/mediatek: Find the cursor plane instead of hard coding it From: CK Hu To: Evan Benn Date: Mon, 10 Feb 2020 10:53:07 +0800 In-Reply-To: <1581064499.590.0.camel@mtksdaap41> References: <20200206140140.GA18465@art_vandelay> <20200207152348.1.Ie0633018fc787dda6e869cae23df76ae30f2a686@changeid> <1581064499.590.0.camel@mtksdaap41> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-MTK: N X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, Matthias Brugger , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi, Evan: On Fri, 2020-02-07 at 16:34 +0800, CK Hu wrote: > Hi, Evan: > > On Fri, 2020-02-07 at 15:23 +1100, Evan Benn wrote: > > The cursor and primary planes were hard coded. > > Now search for them for passing to drm_crtc_init_with_planes > > > > Reviewed-by: CK Hu Applied to mediatek-drm-fixes-5.6 [1], thanks. [1] https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-fixes-5.6 Regards, CK > > > Signed-off-by: Evan Benn > > --- > > > > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 18 ++++++++++++------ > > 1 file changed, 12 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > > index 7b392d6c71cc..935652990afa 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > > @@ -658,10 +658,18 @@ static const struct drm_crtc_helper_funcs mtk_crtc_helper_funcs = { > > > > static int mtk_drm_crtc_init(struct drm_device *drm, > > struct mtk_drm_crtc *mtk_crtc, > > - struct drm_plane *primary, > > - struct drm_plane *cursor, unsigned int pipe) > > + unsigned int pipe) > > { > > - int ret; > > + struct drm_plane *primary = NULL; > > + struct drm_plane *cursor = NULL; > > + int i, ret; > > + > > + for (i = 0; i < mtk_crtc->layer_nr; i++) { > > + if (mtk_crtc->planes[i].type == DRM_PLANE_TYPE_PRIMARY) > > + primary = &mtk_crtc->planes[i]; > > + else if (mtk_crtc->planes[i].type == DRM_PLANE_TYPE_CURSOR) > > + cursor = &mtk_crtc->planes[i]; > > + } > > > > ret = drm_crtc_init_with_planes(drm, &mtk_crtc->base, primary, cursor, > > &mtk_crtc_funcs, NULL); > > @@ -830,9 +838,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, > > return ret; > > } > > > > - ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, &mtk_crtc->planes[0], > > - mtk_crtc->layer_nr > 1 ? &mtk_crtc->planes[1] : > > - NULL, pipe); > > + ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, pipe); > > if (ret < 0) > > return ret; > > > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel 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 X-Spam-Level: X-Spam-Status: No, score=-13.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B7016C35254 for ; Mon, 10 Feb 2020 02:53:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8E274208C4 for ; Mon, 10 Feb 2020 02:53:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="Lae74vM2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727122AbgBJCxP (ORCPT ); Sun, 9 Feb 2020 21:53:15 -0500 Received: from mailgw01.mediatek.com ([210.61.82.183]:38691 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726910AbgBJCxO (ORCPT ); Sun, 9 Feb 2020 21:53:14 -0500 X-UUID: 669d501fcfcc4530a26b11203217b0ac-20200210 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=W9H3gUT21gGxakLPlN7C+OdzFLN/Tl44T7eG40NyIp0=; b=Lae74vM2lIGTQnPzJo/fh/ko34RNSZ4n9XoVN6pkcEpVpsT8Ii2WMVvVkuXVdCpP9TvwJ+CWzxE2MbQJML09lHlOdQvbVglMlbQAJ7F4sD/CvODLq3Rk+MxiTpMuIMSb5vg2EWrkxHetweCevm8ifcFM4eJoclnBBGmRgkvvK8E=; X-UUID: 669d501fcfcc4530a26b11203217b0ac-20200210 Received: from mtkcas07.mediatek.inc [(172.21.101.84)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 77091319; Mon, 10 Feb 2020 10:53:08 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs07n2.mediatek.inc (172.21.101.141) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 10 Feb 2020 10:52:25 +0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkcas07.mediatek.inc (172.21.101.84) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 10 Feb 2020 10:52:18 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Mon, 10 Feb 2020 10:53:24 +0800 Message-ID: <1581303187.951.2.camel@mtksdaap41> Subject: Re: [PATCH] drm/mediatek: Find the cursor plane instead of hard coding it From: CK Hu To: Evan Benn CC: , Philipp Zabel , , Matthias Brugger , , David Airlie , Date: Mon, 10 Feb 2020 10:53:07 +0800 In-Reply-To: <1581064499.590.0.camel@mtksdaap41> References: <20200206140140.GA18465@art_vandelay> <20200207152348.1.Ie0633018fc787dda6e869cae23df76ae30f2a686@changeid> <1581064499.590.0.camel@mtksdaap41> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-MTK: N Content-Transfer-Encoding: base64 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org SGksIEV2YW46DQoNCk9uIEZyaSwgMjAyMC0wMi0wNyBhdCAxNjozNCArMDgwMCwgQ0sgSHUgd3Jv dGU6DQo+IEhpLCBFdmFuOg0KPiANCj4gT24gRnJpLCAyMDIwLTAyLTA3IGF0IDE1OjIzICsxMTAw LCBFdmFuIEJlbm4gd3JvdGU6DQo+ID4gVGhlIGN1cnNvciBhbmQgcHJpbWFyeSBwbGFuZXMgd2Vy ZSBoYXJkIGNvZGVkLg0KPiA+IE5vdyBzZWFyY2ggZm9yIHRoZW0gZm9yIHBhc3NpbmcgdG8gZHJt X2NydGNfaW5pdF93aXRoX3BsYW5lcw0KPiA+IA0KPiANCj4gUmV2aWV3ZWQtYnk6IENLIEh1IDxj ay5odUBtZWRpYXRlay5jb20+DQoNCkFwcGxpZWQgdG8gbWVkaWF0ZWstZHJtLWZpeGVzLTUuNiBb MV0sIHRoYW5rcy4NCg0KWzFdDQpodHRwczovL2dpdGh1Yi5jb20vY2todS1tZWRpYXRlay9saW51 eC5naXQtdGFncy9jb21taXRzL21lZGlhdGVrLWRybS1maXhlcy01LjYNCg0KUmVnYXJkcywNCkNL DQoNCj4gDQo+ID4gU2lnbmVkLW9mZi1ieTogRXZhbiBCZW5uIDxldmFuYmVubkBjaHJvbWl1bS5v cmc+DQo+ID4gLS0tDQo+ID4gDQo+ID4gIGRyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJt X2NydGMuYyB8IDE4ICsrKysrKysrKysrKy0tLS0tLQ0KPiA+ICAxIGZpbGUgY2hhbmdlZCwgMTIg aW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkNCj4gPiANCj4gPiBkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fY3J0Yy5jIGIvZHJpdmVycy9ncHUvZHJtL21l ZGlhdGVrL210a19kcm1fY3J0Yy5jDQo+ID4gaW5kZXggN2IzOTJkNmM3MWNjLi45MzU2NTI5OTBh ZmEgMTAwNjQ0DQo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fY3J0 Yy5jDQo+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fY3J0Yy5jDQo+ ID4gQEAgLTY1OCwxMCArNjU4LDE4IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2NydGNfaGVs cGVyX2Z1bmNzIG10a19jcnRjX2hlbHBlcl9mdW5jcyA9IHsNCj4gPiAgDQo+ID4gIHN0YXRpYyBp bnQgbXRrX2RybV9jcnRjX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRybSwNCj4gPiAgCQkJICAg ICBzdHJ1Y3QgbXRrX2RybV9jcnRjICptdGtfY3J0YywNCj4gPiAtCQkJICAgICBzdHJ1Y3QgZHJt X3BsYW5lICpwcmltYXJ5LA0KPiA+IC0JCQkgICAgIHN0cnVjdCBkcm1fcGxhbmUgKmN1cnNvciwg dW5zaWduZWQgaW50IHBpcGUpDQo+ID4gKwkJCSAgICAgdW5zaWduZWQgaW50IHBpcGUpDQo+ID4g IHsNCj4gPiAtCWludCByZXQ7DQo+ID4gKwlzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5ID0gTlVM TDsNCj4gPiArCXN0cnVjdCBkcm1fcGxhbmUgKmN1cnNvciA9IE5VTEw7DQo+ID4gKwlpbnQgaSwg cmV0Ow0KPiA+ICsNCj4gPiArCWZvciAoaSA9IDA7IGkgPCBtdGtfY3J0Yy0+bGF5ZXJfbnI7IGkr Kykgew0KPiA+ICsJCWlmIChtdGtfY3J0Yy0+cGxhbmVzW2ldLnR5cGUgPT0gRFJNX1BMQU5FX1RZ UEVfUFJJTUFSWSkNCj4gPiArCQkJcHJpbWFyeSA9ICZtdGtfY3J0Yy0+cGxhbmVzW2ldOw0KPiA+ ICsJCWVsc2UgaWYgKG10a19jcnRjLT5wbGFuZXNbaV0udHlwZSA9PSBEUk1fUExBTkVfVFlQRV9D VVJTT1IpDQo+ID4gKwkJCWN1cnNvciA9ICZtdGtfY3J0Yy0+cGxhbmVzW2ldOw0KPiA+ICsJfQ0K PiA+ICANCj4gPiAgCXJldCA9IGRybV9jcnRjX2luaXRfd2l0aF9wbGFuZXMoZHJtLCAmbXRrX2Ny dGMtPmJhc2UsIHByaW1hcnksIGN1cnNvciwNCj4gPiAgCQkJCQkmbXRrX2NydGNfZnVuY3MsIE5V TEwpOw0KPiA+IEBAIC04MzAsOSArODM4LDcgQEAgaW50IG10a19kcm1fY3J0Y19jcmVhdGUoc3Ry dWN0IGRybV9kZXZpY2UgKmRybV9kZXYsDQo+ID4gIAkJCXJldHVybiByZXQ7DQo+ID4gIAl9DQo+ ID4gIA0KPiA+IC0JcmV0ID0gbXRrX2RybV9jcnRjX2luaXQoZHJtX2RldiwgbXRrX2NydGMsICZt dGtfY3J0Yy0+cGxhbmVzWzBdLA0KPiA+IC0JCQkJbXRrX2NydGMtPmxheWVyX25yID4gMSA/ICZt dGtfY3J0Yy0+cGxhbmVzWzFdIDoNCj4gPiAtCQkJCU5VTEwsIHBpcGUpOw0KPiA+ICsJcmV0ID0g bXRrX2RybV9jcnRjX2luaXQoZHJtX2RldiwgbXRrX2NydGMsIHBpcGUpOw0KPiA+ICAJaWYgKHJl dCA8IDApDQo+ID4gIAkJcmV0dXJuIHJldDsNCj4gPiAgDQo+IA0KDQo=