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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 27F36C432C0 for ; Mon, 18 Nov 2019 06:18:46 +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 F05AD206D4 for ; Mon, 18 Nov 2019 06:18:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="WpDOmVPv"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="BXpHZhA/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F05AD206D4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org 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: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=hn7QxnJvjHu1+Zq8tjD480FAQnKLbYsLJbcJvg0jRS8=; b=WpDOmVPvlo/gvr 2d2hQfx5hFdgwUrWak0I+b1tfGuV0N1ph/JnYDChUBr3+eZKUk6h8Va/57MdEdKooTDvq0exhdSHX slxy+uC52tpeY/wbltaCUEFL9Y6G5Hze+dDro7b+taD6grjsuEzxCoqjWO6azxDXBOO/edK9w+S4j FuHSMsTANlEsG4hArJzs3AJWGofXRUOeY7jPg63CpVmg0mCJ/72QFijstNb3Ffh6gp2+bEOjd84Xh KGypyFa+B2uLplJEwPNtcxw0uJB4iSSz6R2ptecn/2ukYcMgmRfDEEYCdjc7gttyIC6XViLJ4fWYd i/ee4LTZN/u7wK74YMTw==; 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 1iWaN1-0000u0-2f; Mon, 18 Nov 2019 06:18:43 +0000 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iWaMy-0000sS-7g for linux-arm-kernel@lists.infradead.org; Mon, 18 Nov 2019 06:18:41 +0000 Received: by mail-pl1-x644.google.com with SMTP id d7so9169941pls.3 for ; Sun, 17 Nov 2019 22:18:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=In3dXboSGxSDc4571/sMxtCG8no6hvyudyiC85O5ndo=; b=BXpHZhA/xlBopIauk0uUtCcrKTLJpeohwqpkdx+pyeB6cHC23OkMv5szao3WoFQgWG bpGQhs8COapoRUFUUwCikZIhzDyoPIVni7BgFnJxCR8+nXcXKRftiZoiC0dq8IG2LBaL aXBBWuLKQw+ZwkDv48ctSYKopX322s7+2kZLY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=In3dXboSGxSDc4571/sMxtCG8no6hvyudyiC85O5ndo=; b=jsZyiXiJcSOUI72z634HWvtjGOo9ju/YbZJn4mLhIqWKu1NCbD7zs6mWqtX3ja7ycv CjLYgMV1ALZ93PqtJncE0XMv9Gs1JC+qad4cAY3qGX8MvP5kCOG5V1TMZCEaIuC5VX25 eA4htVSj0LG+rSOwyODBDtGp6pUPEmJAMfjHpTdbu0YRzqd+7fs1ursa8JI8ck38NW+W HNGkbFCkhXoY2UvelDBJFgA+ie6Lv+0qKEZtW4gxi5uxbJWAbnEdQ0ITw/XdDFnW1P07 TnNykNKNh63UeMr7DwduALg56cyG/Oae/7LIMhValYPuNFLDRaMrpkhXWbnKFIL86/TY aRmQ== X-Gm-Message-State: APjAAAWsV3RW0lg4UKWMYreOcfYTGyMKEsTHslHYZhz/C2UXRyHUDVln 1hWZhukfL+V5LgpJZgemVsnFlg== X-Google-Smtp-Source: APXvYqxnGeAgTQrGlxhEM7cTtw/taIbeaI+NICqi0AiVOjf/RFlGTltFPJg8umDnYkhUrvkNVqGXOw== X-Received: by 2002:a17:902:8f98:: with SMTP id z24mr21453839plo.35.1574057915737; Sun, 17 Nov 2019 22:18:35 -0800 (PST) Received: from pihsun-z840.tpe.corp.google.com ([2401:fa00:1:10:7889:7a43:f899:134c]) by smtp.googlemail.com with ESMTPSA id g4sm18589682pfh.172.2019.11.17.22.18.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Nov 2019 22:18:35 -0800 (PST) From: Pi-Hsun Shih To: Subject: [PATCH] drm/mediatek: Check return value of mtk_drm_ddp_comp_for_plane. Date: Mon, 18 Nov 2019 14:18:05 +0800 Message-Id: <20191118061806.52781-1-pihsun@chromium.org> X-Mailer: git-send-email 2.24.0.432.g9d3f5f5b63-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191117_221840_304796_A837C816 X-CRM114-Status: GOOD ( 10.19 ) 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: Philipp Zabel , David Airlie , "moderated list:ARM/Mediatek SoC support" , open list , "open list:DRM DRIVERS FOR MEDIATEK" , Matthias Brugger , Pi-Hsun Shih , Daniel Vetter , CK Hu , Sean Paul , "moderated list:ARM/Mediatek SoC support" 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 The mtk_drm_ddp_comp_for_plane can return NULL, but the usage doesn't check for it. Add check for it. Fixes: d6b53f68356f ("drm/mediatek: Add helper to get component for a plane") Signed-off-by: Pi-Hsun Shih --- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c index f80a8ba75977..4c4f976c994e 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c @@ -310,7 +310,9 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc) plane_state = to_mtk_plane_state(plane->state); comp = mtk_drm_ddp_comp_for_plane(crtc, plane, &local_layer); - mtk_ddp_comp_layer_config(comp, local_layer, plane_state); + if (comp) + mtk_ddp_comp_layer_config(comp, local_layer, + plane_state); } return 0; @@ -386,8 +388,9 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc) comp = mtk_drm_ddp_comp_for_plane(crtc, plane, &local_layer); - mtk_ddp_comp_layer_config(comp, local_layer, - plane_state); + if (comp) + mtk_ddp_comp_layer_config(comp, local_layer, + plane_state); plane_state->pending.config = false; } mtk_crtc->pending_planes = false; @@ -401,7 +404,9 @@ int mtk_drm_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane, struct mtk_ddp_comp *comp; comp = mtk_drm_ddp_comp_for_plane(crtc, plane, &local_layer); - return mtk_ddp_comp_layer_check(comp, local_layer, state); + if (comp) + return mtk_ddp_comp_layer_check(comp, local_layer, state); + return 0; } static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc, base-commit: 5a6fcbeabe3e20459ed8504690b2515dacc5246f -- 2.24.0.432.g9d3f5f5b63-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel