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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id F0569C71153 for ; Tue, 29 Aug 2023 13:20:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=I6+UmeKBuB6CucCMCQp2vyu3a7TQ6qQRz4yXZEaG2sc=; b=FDiTFERNa0aZgg mBxA18LqFz9CusPBURqAHl9oEG5lajRoLxDaCaM48btoDQCmBhnJmyoSrrIMFJLt79OsmIxL1yoIb 1m7tq7QeHwH8dsC+HsLYBrqeeWJrYKd0XfWvtE+NJgXTPxGUK2JPXM8QLztzrWODWe+Aq9JYI0ekQ csnQUzohuhqXQ7NBViAk33FZzT115CQwUcT3wsCWTiqEnzPPnymuUD7nNY5vzbYux8+pq4Z6+ZqQF 44WoVa7BSCmdFEY5y7W/Td/JlGU9SzVpnVDBWQiF8huH/ve+yw7CGtAq3WkCVL3cEjmhIKatpF/tO 4wdgrWp7GFG5wKsgZ3Tg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qaye2-00BZmd-2M; Tue, 29 Aug 2023 13:20:34 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qaydx-00BZk7-2y; Tue, 29 Aug 2023 13:20:31 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 98E7A65266; Tue, 29 Aug 2023 13:20:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0331AC433CB; Tue, 29 Aug 2023 13:20:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1693315224; bh=VmiiCQJmx/vUEhDJNuwCqJdIf0rnLGfJEi9IfqpWrHY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NS5NeyHzBnEpCSp8tUcOhptK84Gn4+X+ta5XVY9kk0xU+tA6sgA9p6xWqjx/JL/nR fSVCOyncSFQy3jAIVO+vfbKbwmzBzfvykwgR18CuIfxtp4893xTNP/bWRXyYziGz3R dknzHrw6+ldB986WCqR7L0Y6hF+IlfZPrsEk3KXoz+y2a14lN8E6W2q2yymKdDLl4q ttO4a2hm8M9h4CXFmwHFFhAU7YspeVrR+PZntfgwPtbxvGfGAU52SzcUtBYttHSKqp TqBoM5xj1iHL0Ppn37bGy1ZhdqPmIBFIlh/k3NNWM2VWZ1U5Ulfj25h5Pd1YQhQ47O 9hFiSIDrm9Dzw== From: Michael Walle To: =?UTF-8?q?N=C3=ADcolas=20F=20=2E=20R=20=2E=20A=20=2E=20Prado?= , Chun-Kuang Hu , Philipp Zabel , David Airlie , Daniel Vetter , Matthias Brugger , AngeloGioacchino Del Regno Subject: [PATCH 2/2] drm/mediatek: dpi/dsi: fix possible_crtcs calculation Date: Tue, 29 Aug 2023 15:19:41 +0200 Message-Id: <20230829131941.3353439-2-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230829131941.3353439-1-mwalle@kernel.org> References: <20230829131941.3353439-1-mwalle@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230829_062030_045875_8D792570 X-CRM114-Status: GOOD ( 15.10 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jitao Shi , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, "Nancy . Lin" , linux-mediatek@lists.infradead.org, Stu Hsieh , Michael Walle , linux-arm-kernel@lists.infradead.org Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org mtk_drm_find_possible_crtc_by_comp() assumed that the main path will always have the CRTC with id 0, the ext id 1 and the third id 2. This is only true if the paths are all available. But paths are optional (see also comment in mtk_drm_kms_init()), e.g. the main path might not be enabled or available at all. Then the CRTC IDs will shift one up, e.g. ext will be 1 and the third path will be 2. To fix that, dynamically calculate the IDs by the precence of the paths. Fixes: 5aa8e7647676 ("drm/mediatek: dpi/dsi: Change the getting possible_crtc way") Suggested-by: Nícolas F. R. A. Prado Signed-off-by: Michael Walle --- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 41 ++++++++++++++------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c index 771f4e173353..f3064bff64e8 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c @@ -526,21 +526,34 @@ 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; - - 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"); + int i = 0; + + if (private->data->main_path) { + if (mtk_drm_find_comp_in_ddp(dev, private->data->main_path, + private->data->main_len, + private->ddp_comp)) + return BIT(i); + i++; + } + + if (private->data->ext_path) { + if (mtk_drm_find_comp_in_ddp(dev, private->data->ext_path, + private->data->ext_len, + private->ddp_comp)) + return BIT(i); + i++; + } - return ret; + if (private->data->third_path) { + if (mtk_drm_find_comp_in_ddp(dev, private->data->third_path, + private->data->third_len, + private->ddp_comp)) + return BIT(i); + i++; + } + + 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, -- 2.39.2 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 5B2D2C83F12 for ; Tue, 29 Aug 2023 13:20:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=uOLKPoZn17Anpgr+Dr2kxas2ARgiyHssFz5rgADx5i0=; b=S6yEj7MZEcQXXy r9jIekH0WQ+R2Pil+7iqNVytOPMdHblJEQein/3MYI9fYiUUT8Ax62X7cW6abx7UWNgW6nGEt0YKl YY+cVmJMyadkvQNMmlUw9Zw+1/q0xSPLOFPe13ez4WHFp/4HbaiGToz4v6iXHKhZfIwiwnkP5XtDy DE425HsHuXthQxhmW7CJxpwD/6crBCbONDVnrVe+l3lwF8ryY/Koj5FFmq91Hcm7TmKYQik6JjUkx 0U/m4YwyMVKesfCPzn9QOJE8dxLxQJoovXJiHY2BmRrQRVG4mXlhybwdgQwPvm8xDLHEmMzIFycoY +AbS8IOEAiv6GbPurqIA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qaye1-00BZm9-0f; Tue, 29 Aug 2023 13:20:33 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qaydx-00BZk7-2y; Tue, 29 Aug 2023 13:20:31 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 98E7A65266; Tue, 29 Aug 2023 13:20:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0331AC433CB; Tue, 29 Aug 2023 13:20:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1693315224; bh=VmiiCQJmx/vUEhDJNuwCqJdIf0rnLGfJEi9IfqpWrHY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NS5NeyHzBnEpCSp8tUcOhptK84Gn4+X+ta5XVY9kk0xU+tA6sgA9p6xWqjx/JL/nR fSVCOyncSFQy3jAIVO+vfbKbwmzBzfvykwgR18CuIfxtp4893xTNP/bWRXyYziGz3R dknzHrw6+ldB986WCqR7L0Y6hF+IlfZPrsEk3KXoz+y2a14lN8E6W2q2yymKdDLl4q ttO4a2hm8M9h4CXFmwHFFhAU7YspeVrR+PZntfgwPtbxvGfGAU52SzcUtBYttHSKqp TqBoM5xj1iHL0Ppn37bGy1ZhdqPmIBFIlh/k3NNWM2VWZ1U5Ulfj25h5Pd1YQhQ47O 9hFiSIDrm9Dzw== From: Michael Walle To: =?UTF-8?q?N=C3=ADcolas=20F=20=2E=20R=20=2E=20A=20=2E=20Prado?= , Chun-Kuang Hu , Philipp Zabel , David Airlie , Daniel Vetter , Matthias Brugger , AngeloGioacchino Del Regno Cc: "Nancy . Lin" , Frank Wunderlich , Jitao Shi , Stu Hsieh , dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH 2/2] drm/mediatek: dpi/dsi: fix possible_crtcs calculation Date: Tue, 29 Aug 2023 15:19:41 +0200 Message-Id: <20230829131941.3353439-2-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230829131941.3353439-1-mwalle@kernel.org> References: <20230829131941.3353439-1-mwalle@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230829_062030_045875_8D792570 X-CRM114-Status: GOOD ( 15.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org bXRrX2RybV9maW5kX3Bvc3NpYmxlX2NydGNfYnlfY29tcCgpIGFzc3VtZWQgdGhhdCB0aGUgbWFp biBwYXRoIHdpbGwKYWx3YXlzIGhhdmUgdGhlIENSVEMgd2l0aCBpZCAwLCB0aGUgZXh0IGlkIDEg YW5kIHRoZSB0aGlyZCBpZCAyLiBUaGlzCmlzIG9ubHkgdHJ1ZSBpZiB0aGUgcGF0aHMgYXJlIGFs bCBhdmFpbGFibGUuIEJ1dCBwYXRocyBhcmUgb3B0aW9uYWwgKHNlZQphbHNvIGNvbW1lbnQgaW4g bXRrX2RybV9rbXNfaW5pdCgpKSwgZS5nLiB0aGUgbWFpbiBwYXRoIG1pZ2h0IG5vdCBiZQplbmFi bGVkIG9yIGF2YWlsYWJsZSBhdCBhbGwuIFRoZW4gdGhlIENSVEMgSURzIHdpbGwgc2hpZnQgb25l IHVwLCBlLmcuCmV4dCB3aWxsIGJlIDEgYW5kIHRoZSB0aGlyZCBwYXRoIHdpbGwgYmUgMi4KClRv IGZpeCB0aGF0LCBkeW5hbWljYWxseSBjYWxjdWxhdGUgdGhlIElEcyBieSB0aGUgcHJlY2VuY2Ug b2YgdGhlIHBhdGhzLgoKRml4ZXM6IDVhYThlNzY0NzY3NiAoImRybS9tZWRpYXRlazogZHBpL2Rz aTogQ2hhbmdlIHRoZSBnZXR0aW5nIHBvc3NpYmxlX2NydGMgd2F5IikKU3VnZ2VzdGVkLWJ5OiBO w61jb2xhcyBGLiBSLiBBLiBQcmFkbyA8bmZyYXByYWRvQGNvbGxhYm9yYS5jb20+ClNpZ25lZC1v ZmYtYnk6IE1pY2hhZWwgV2FsbGUgPG13YWxsZUBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9tZWRpYXRlay9tdGtfZHJtX2RkcF9jb21wLmMgfCA0MSArKysrKysrKysrKysrKy0tLS0t LS0KIDEgZmlsZSBjaGFuZ2VkLCAyNyBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RybV9kZHBfY29tcC5jIGIv ZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fZGRwX2NvbXAuYwppbmRleCA3NzFmNGUx NzMzNTMuLmYzMDY0YmZmNjRlOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVr L210a19kcm1fZGRwX2NvbXAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2Ry bV9kZHBfY29tcC5jCkBAIC01MjYsMjEgKzUyNiwzNCBAQCB1bnNpZ25lZCBpbnQgbXRrX2RybV9m aW5kX3Bvc3NpYmxlX2NydGNfYnlfY29tcChzdHJ1Y3QgZHJtX2RldmljZSAqZHJtLAogCQkJCQkJ c3RydWN0IGRldmljZSAqZGV2KQogewogCXN0cnVjdCBtdGtfZHJtX3ByaXZhdGUgKnByaXZhdGUg PSBkcm0tPmRldl9wcml2YXRlOwotCXVuc2lnbmVkIGludCByZXQgPSAwOwotCi0JaWYgKG10a19k cm1fZmluZF9jb21wX2luX2RkcChkZXYsIHByaXZhdGUtPmRhdGEtPm1haW5fcGF0aCwgcHJpdmF0 ZS0+ZGF0YS0+bWFpbl9sZW4sCi0JCQkJICAgICBwcml2YXRlLT5kZHBfY29tcCkpCi0JCXJldCA9 IEJJVCgwKTsKLQllbHNlIGlmIChtdGtfZHJtX2ZpbmRfY29tcF9pbl9kZHAoZGV2LCBwcml2YXRl LT5kYXRhLT5leHRfcGF0aCwKLQkJCQkJICBwcml2YXRlLT5kYXRhLT5leHRfbGVuLCBwcml2YXRl LT5kZHBfY29tcCkpCi0JCXJldCA9IEJJVCgxKTsKLQllbHNlIGlmIChtdGtfZHJtX2ZpbmRfY29t cF9pbl9kZHAoZGV2LCBwcml2YXRlLT5kYXRhLT50aGlyZF9wYXRoLAotCQkJCQkgIHByaXZhdGUt PmRhdGEtPnRoaXJkX2xlbiwgcHJpdmF0ZS0+ZGRwX2NvbXApKQotCQlyZXQgPSBCSVQoMik7Ci0J ZWxzZQotCQlEUk1fSU5GTygiRmFpbGVkIHRvIGZpbmQgY29tcCBpbiBkZHAgdGFibGVcbiIpOwor CWludCBpID0gMDsKKworCWlmIChwcml2YXRlLT5kYXRhLT5tYWluX3BhdGgpIHsKKwkJaWYgKG10 a19kcm1fZmluZF9jb21wX2luX2RkcChkZXYsIHByaXZhdGUtPmRhdGEtPm1haW5fcGF0aCwKKwkJ CQkJICAgICBwcml2YXRlLT5kYXRhLT5tYWluX2xlbiwKKwkJCQkJICAgICBwcml2YXRlLT5kZHBf Y29tcCkpCisJCQlyZXR1cm4gQklUKGkpOworCQlpKys7CisJfQorCisJaWYgKHByaXZhdGUtPmRh dGEtPmV4dF9wYXRoKSB7CisJCWlmIChtdGtfZHJtX2ZpbmRfY29tcF9pbl9kZHAoZGV2LCBwcml2 YXRlLT5kYXRhLT5leHRfcGF0aCwKKwkJCQkJICAgICBwcml2YXRlLT5kYXRhLT5leHRfbGVuLAor CQkJCQkgICAgIHByaXZhdGUtPmRkcF9jb21wKSkKKwkJCXJldHVybiBCSVQoaSk7CisJCWkrKzsK Kwl9CiAKLQlyZXR1cm4gcmV0OworCWlmIChwcml2YXRlLT5kYXRhLT50aGlyZF9wYXRoKSB7CisJ CWlmIChtdGtfZHJtX2ZpbmRfY29tcF9pbl9kZHAoZGV2LCBwcml2YXRlLT5kYXRhLT50aGlyZF9w YXRoLAorCQkJCQkgICAgIHByaXZhdGUtPmRhdGEtPnRoaXJkX2xlbiwKKwkJCQkJICAgICBwcml2 YXRlLT5kZHBfY29tcCkpCisJCQlyZXR1cm4gQklUKGkpOworCQlpKys7CisJfQorCisJRFJNX0lO Rk8oIkZhaWxlZCB0byBmaW5kIGNvbXAgaW4gZGRwIHRhYmxlXG4iKTsKKwlyZXR1cm4gMDsKIH0K IAogaW50IG10a19kZHBfY29tcF9pbml0KHN0cnVjdCBkZXZpY2Vfbm9kZSAqbm9kZSwgc3RydWN0 IG10a19kZHBfY29tcCAqY29tcCwKLS0gCjIuMzkuMgoKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0Cmxp bnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFk Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 07962C71153 for ; Tue, 29 Aug 2023 13:20:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3E5DC10E1D9; Tue, 29 Aug 2023 13:20:31 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5296510E1D9 for ; Tue, 29 Aug 2023 13:20:25 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 98E7A65266; Tue, 29 Aug 2023 13:20:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0331AC433CB; Tue, 29 Aug 2023 13:20:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1693315224; bh=VmiiCQJmx/vUEhDJNuwCqJdIf0rnLGfJEi9IfqpWrHY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NS5NeyHzBnEpCSp8tUcOhptK84Gn4+X+ta5XVY9kk0xU+tA6sgA9p6xWqjx/JL/nR fSVCOyncSFQy3jAIVO+vfbKbwmzBzfvykwgR18CuIfxtp4893xTNP/bWRXyYziGz3R dknzHrw6+ldB986WCqR7L0Y6hF+IlfZPrsEk3KXoz+y2a14lN8E6W2q2yymKdDLl4q ttO4a2hm8M9h4CXFmwHFFhAU7YspeVrR+PZntfgwPtbxvGfGAU52SzcUtBYttHSKqp TqBoM5xj1iHL0Ppn37bGy1ZhdqPmIBFIlh/k3NNWM2VWZ1U5Ulfj25h5Pd1YQhQ47O 9hFiSIDrm9Dzw== From: Michael Walle To: =?UTF-8?q?N=C3=ADcolas=20F=20=2E=20R=20=2E=20A=20=2E=20Prado?= , Chun-Kuang Hu , Philipp Zabel , David Airlie , Daniel Vetter , Matthias Brugger , AngeloGioacchino Del Regno Subject: [PATCH 2/2] drm/mediatek: dpi/dsi: fix possible_crtcs calculation Date: Tue, 29 Aug 2023 15:19:41 +0200 Message-Id: <20230829131941.3353439-2-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230829131941.3353439-1-mwalle@kernel.org> References: <20230829131941.3353439-1-mwalle@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Jitao Shi , Frank Wunderlich , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, "Nancy . Lin" , linux-mediatek@lists.infradead.org, Stu Hsieh , Michael Walle , linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" mtk_drm_find_possible_crtc_by_comp() assumed that the main path will always have the CRTC with id 0, the ext id 1 and the third id 2. This is only true if the paths are all available. But paths are optional (see also comment in mtk_drm_kms_init()), e.g. the main path might not be enabled or available at all. Then the CRTC IDs will shift one up, e.g. ext will be 1 and the third path will be 2. To fix that, dynamically calculate the IDs by the precence of the paths. Fixes: 5aa8e7647676 ("drm/mediatek: dpi/dsi: Change the getting possible_crtc way") Suggested-by: Nícolas F. R. A. Prado Signed-off-by: Michael Walle --- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 41 ++++++++++++++------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c index 771f4e173353..f3064bff64e8 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c @@ -526,21 +526,34 @@ 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; - - 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"); + int i = 0; + + if (private->data->main_path) { + if (mtk_drm_find_comp_in_ddp(dev, private->data->main_path, + private->data->main_len, + private->ddp_comp)) + return BIT(i); + i++; + } + + if (private->data->ext_path) { + if (mtk_drm_find_comp_in_ddp(dev, private->data->ext_path, + private->data->ext_len, + private->ddp_comp)) + return BIT(i); + i++; + } - return ret; + if (private->data->third_path) { + if (mtk_drm_find_comp_in_ddp(dev, private->data->third_path, + private->data->third_len, + private->ddp_comp)) + return BIT(i); + i++; + } + + 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, -- 2.39.2