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 3454DC43603 for ; Thu, 12 Dec 2019 04:49:11 +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 0081921655 for ; Thu, 12 Dec 2019 04:49:10 +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="IPUJTxwI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0081921655 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 3ED7D6EC51; Thu, 12 Dec 2019 04:49:10 +0000 (UTC) Received: from mailgw01.mediatek.com (unknown [210.61.82.183]) by gabe.freedesktop.org (Postfix) with ESMTP id 747FB6EC51 for ; Thu, 12 Dec 2019 04:49:07 +0000 (UTC) X-UUID: d8f23ae9e30540f2b273bd87852f6fe0-20191212 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=E+WerAWO7LXcxAkqLk99bj1sr3WlUYbo9Q9kI8fEORY=; b=IPUJTxwI2NNddllHMyhFySNdSF1bZRmbJz/aH5sxtX9jyyRd44Mj3teUXlS+8/PFMrAQBZBGCiDn6VwPsrrwrfeBOJvTgGP0CNsZitfo3H/5tv+JaMuBb92Nzj0Y7EdMg/JCv0NUb6qs6MK/ev3OiB2qRjTbpHQT/VP7lxDZObU=; X-UUID: d8f23ae9e30540f2b273bd87852f6fe0-20191212 Received: from mtkcas06.mediatek.inc [(172.21.101.30)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 1797774077; Thu, 12 Dec 2019 12:49:05 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs01n1.mediatek.inc (172.21.101.68) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 12 Dec 2019 12:48:44 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Thu, 12 Dec 2019 12:48:54 +0800 Message-ID: <1576126139.29693.2.camel@mtksdaap41> Subject: Re: [PATCH] drm/mediatek: Check return value of mtk_drm_ddp_comp_for_plane. From: CK Hu To: Pi-Hsun Shih Date: Thu, 12 Dec 2019 12:48:59 +0800 In-Reply-To: <1574409521.12825.0.camel@mtksdaap41> References: <20191118061806.52781-1-pihsun@chromium.org> <1574409521.12825.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 , open list , "open list:DRM DRIVERS FOR MEDIATEK" , Sean Paul , Matthias Brugger , "moderated list:ARM/Mediatek SoC support" , "moderated list:ARM/Mediatek SoC support" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi, Pi-Hsun: On Fri, 2019-11-22 at 15:58 +0800, CK Hu wrote: > Hi, Pi-Hsun: > > On Mon, 2019-11-18 at 14:18 +0800, Pi-Hsun Shih wrote: > > The mtk_drm_ddp_comp_for_plane can return NULL, but the usage doesn't > > check for it. Add check for it. > > Reviewed-by: CK Hu > Applied to mediatek-drm-fixes-5.5 [1], thanks. [1] https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-fixes-5.5 Regards, CK > > > > 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 > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel