From patchwork Fri Sep 1 17:45:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13372803 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 187C1CA0FEC for ; Fri, 1 Sep 2023 17:46:13 +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: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:In-Reply-To:References: List-Owner; bh=k7pwDEidFyxqiNCWcSli7buf6Wkh+QBut9N2gkUeK5s=; b=y2heMCs0XSJIq3 3b/tBIDhkwYE6Y1Db3c4p9uNcMlpM/WdKRm+ghvByI+JBG2jXgi2a3MXxzjpygh8Y66jGvldnVrX6 5ooYUwOkiVdkPgsB2zkwLMBFkmHe4uPMJQJ5MRvzv1mbEMwDCvXeJt4UzoiKjrzj0UbFVa+/RoE36 dFg4fcvtXUpRNxItxxi1gbJQRklj5rZhzHUP9lLWeJ5yjeHX/kCUZr/xn9Ix1ZdNXlVAj+x+SVEr1 mKHl8+LhQWERX0tc82vRt2kbSqiv7SPJ/80gG7yNDX0q/1r8f8chF/l5svvYPuHDdMlvQ8KwLDv6N rbpQNnsC/hfP7LTtIivQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qc8Dj-000FWp-2Q; Fri, 01 Sep 2023 17:46:11 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qc8Df-000FVs-27; Fri, 01 Sep 2023 17:46:09 +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 sin.source.kernel.org (Postfix) with ESMTPS id C25A5CE22C7; Fri, 1 Sep 2023 17:46:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E8E9C433C8; Fri, 1 Sep 2023 17:46:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1693590364; bh=z9MFcKUA2gr9p3j7guEmqBFsjLvJtfm5s1/pUyVg+9Y=; h=From:To:Cc:Subject:Date:From; b=k/5mo1IkqXCkSxQa+gyzgn6haj2cRQXCR4ZFizjIzBSukbJhsL/7CdHHWrtyP8Oj7 fNL/IkYS/90YeimQkiMbkRZ0wdeeUxL2upgGMOcANCUa69e74yXdMux554fF+ruGqL g/ck3fVYUVmRudEeBrQHKSDTSFZwHyTVX78/BGZnhzk8OKYzv8s9nN0SFFInwrJoFs PHE2nE11z3911CIRAE8+iM9ngoCsdK1NGz3CzRYYDNFSo/zw+ICiSU0BDxbjQRzXob Dh4+rszthPUp0fkr5aqSPa6Ad8CJyxansjQXNZPogGiNsZa14qFF5RgoiD5UiU0r4C PiHkSeqVQAAzg== From: Michael Walle To: =?utf-8?q?N=C3=ADcolas_F_=2E_R_=2E_A_=2E_Prado?= , Chun-Kuang Hu , Philipp Zabel , David Airlie , Daniel Vetter , Matthias Brugger , AngeloGioacchino Del Regno Subject: [PATCH v3 1/2] drm/mediatek: fix kernel oops if no crtc is found Date: Fri, 1 Sep 2023 19:45:56 +0200 Message-Id: <20230901174557.3617839-1-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230901_104607_872516_69AC9A64 X-CRM114-Status: GOOD ( 14.79 ) 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 drm_crtc_from_index(0) might return NULL if there are no CRTCs registered at all which will lead to a kernel oops in mtk_drm_crtc_dma_dev_get(). Add the missing return value check. Fixes: 0d9eee9118b7 ("drm/mediatek: Add drm ovl_adaptor sub driver for MT8195") Signed-off-by: Michael Walle Reviewed-by: Nícolas F. R. A. Prado Tested-by: Nícolas F. R. A. Prado Reviewed-by: AngeloGioacchino Del Regno --- v3: - none v2: - collected tags - fixed typos --- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 93552d76b6e7..2c582498817e 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -420,6 +420,7 @@ static int mtk_drm_kms_init(struct drm_device *drm) struct mtk_drm_private *private = drm->dev_private; struct mtk_drm_private *priv_n; struct device *dma_dev = NULL; + struct drm_crtc *crtc; int ret, i, j; if (drm_firmware_drivers_only()) @@ -494,7 +495,9 @@ static int mtk_drm_kms_init(struct drm_device *drm) } /* Use OVL device for all DMA memory allocations */ - dma_dev = mtk_drm_crtc_dma_dev_get(drm_crtc_from_index(drm, 0)); + crtc = drm_crtc_from_index(drm, 0); + if (crtc) + dma_dev = mtk_drm_crtc_dma_dev_get(crtc); if (!dma_dev) { ret = -ENODEV; dev_err(drm->dev, "Need at least one OVL device\n");