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=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 11E44C33C99 for ; Fri, 10 Jan 2020 06:30: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 D7F8A2072E for ; Fri, 10 Jan 2020 06:30:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Cp8fVTQK"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="C1L+sKks" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D7F8A2072E 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=ZV/wrxVZ8iEEcxH42tMcDIgUNpmHFsx48LJFq8ttbv8=; b=Cp8fVTQK7ebPpU c01lN6xWcY8N/x6EoSfscQvS3rk/6BR7ckTB5suQe9ZwOoA4TdF8ZZplsAI/19fuMkkNmJ4ho6XvK S4O8aFD/fGjQqDjUq1y9pX/70NzUk/pV6qeFnnMj+MKv7068F/tf0EQCtv6f+Mbz1oPSMwHd2pqZB JSNLfx/EQsZXfqjOEZ6JmuxS9fy5wxR9Noj8CPJlLz2SPEbvXvGhL+nt/VOcMVTXRnPAn5+taXXp4 dC6v7rG0+VyBZ06vuOh2h0z2HsIciqUT6Z39s0sA8w7OzLvDnowjnRvbg+VRokucJTWjgI06eqbNV XAWan+lWZkWSGInJUtQw==; 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 1ipnoE-0006gR-4c; Fri, 10 Jan 2020 06:30:14 +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 1ipno2-0005M0-MZ; Fri, 10 Jan 2020 06:30:04 +0000 X-UUID: 3a709631d0df46f19b826d746124cbce-20200109 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=2hX33a9oKQvAaZtJ3NQ0cW54cICk0Docx++JIfjlN54=; b=C1L+sKksrUCaSk1L4aeeOVIVRwEj1HUrt9aleg63TRWpo7VBpUS81ERuh3PNSUunD9Xu1wprIqEyvlTGUgv9u46+P+pc5ZtS6J/CrC9/cU+QCMQc5rn+h0O25Y2pUfHBO53nYFXa68rXi9isephJKUdMzm32vi13QPLKNVRvKQI=; X-UUID: 3a709631d0df46f19b826d746124cbce-20200109 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1538986212; Thu, 09 Jan 2020 22:29:49 -0800 Received: from MTKMBS02N1.mediatek.inc (172.21.101.77) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 9 Jan 2020 22:20:25 -0800 Received: from mtkcas09.mediatek.inc (172.21.101.178) by mtkmbs02n1.mediatek.inc (172.21.101.77) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 10 Jan 2020 14:18:47 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas09.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Fri, 10 Jan 2020 14:20:24 +0800 Message-ID: <1578637185.29400.3.camel@mtksdaap41> Subject: Re: [PATCH] drm/mediatek: check for comp->funcs From: CK Hu To: Hsin-Yi Wang Date: Fri, 10 Jan 2020 14:19:45 +0800 In-Reply-To: <20200109072900.17988-1-hsinyi@chromium.org> References: <20200109072900.17988-1-hsinyi@chromium.org> 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-20200109_223002_754966_A17C232D X-CRM114-Status: GOOD ( 14.85 ) 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, Hsin-yi: On Thu, 2020-01-09 at 15:29 +0800, Hsin-Yi Wang wrote: > There might be some comp that doesn't have funcs, eg. hdmi-connector. > Check for comp->funcs otherwise there will be NULL pointer dereference > crash. > > Fixes: bd3de8cd782b ("drm/mediatek: Add gamma property according to hardware capability") > Fixes: 7395eab077f9 ("drm/mediatek: Add ctm property support") Because the fixed patches are still in my tree, so I merge this patch with the fixed patches in mediatek-drm-next-5.6 [1]. [1] https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-next-5.6 Regards, CK > Signed-off-by: Hsin-Yi Wang > --- > This patch is based on mediatek's drm branch: > https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-next-5.6 > > After > https://patchwork.freedesktop.org/patch/344477/?series=63328&rev=59, > there will also be funcs for hdmi-connector. > --- > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > index fb142fcfc353..7b392d6c71cc 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > @@ -808,11 +808,13 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, > > mtk_crtc->ddp_comp[i] = comp; > > - if (comp->funcs->ctm_set) > - has_ctm = true; > + if (comp->funcs) { > + if (comp->funcs->ctm_set) > + has_ctm = true; > > - if (comp->funcs->gamma_set) > - gamma_lut_size = MTK_LUT_SIZE; > + if (comp->funcs->gamma_set) > + gamma_lut_size = MTK_LUT_SIZE; > + } > } > > for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) _______________________________________________ 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=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 EF07EC33C99 for ; Fri, 10 Jan 2020 06:30:10 +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 C0B012072E for ; Fri, 10 Jan 2020 06:30:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="QXl06wza"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="C1L+sKks" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C0B012072E 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=9ubkhwFOISi47zN5xwo6NnnYnoTJY7CIILrXyXL1AJ0=; b=QXl06wza1WdWyF Ire+rogLUf4SNfMD3OQu5/xrqjyNbgCJUTEytYxTcPcZas+REvJf8t+aw83MyGuQPS6IUwDKP85vi 3yVAUlx7O5ZxJVizK9kyz3JLbY+7aFqsBKvuwV+gs9LIXudyOd2khdBdBSIhEfj5Ld0bAWF6fyCua pkmwO/eK+dx6Q5RfE17ASojta7wNFjosODnYoj+6Z2nLjn49xclZahjrRtyrp9pGEJz2XtKngeSBM wP+SdRcaE0W6eHXFV8fwobt2zGZzysCwE+51rdi3x1NxfMJbbeO5Ia7kSEXWabA/XOorIALfmmuuB bOPzw1B4Ha6h+u9WiI9A==; 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 1ipno7-00069v-7c; Fri, 10 Jan 2020 06:30:07 +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 1ipno2-0005M0-MZ; Fri, 10 Jan 2020 06:30:04 +0000 X-UUID: 3a709631d0df46f19b826d746124cbce-20200109 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=2hX33a9oKQvAaZtJ3NQ0cW54cICk0Docx++JIfjlN54=; b=C1L+sKksrUCaSk1L4aeeOVIVRwEj1HUrt9aleg63TRWpo7VBpUS81ERuh3PNSUunD9Xu1wprIqEyvlTGUgv9u46+P+pc5ZtS6J/CrC9/cU+QCMQc5rn+h0O25Y2pUfHBO53nYFXa68rXi9isephJKUdMzm32vi13QPLKNVRvKQI=; X-UUID: 3a709631d0df46f19b826d746124cbce-20200109 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1538986212; Thu, 09 Jan 2020 22:29:49 -0800 Received: from MTKMBS02N1.mediatek.inc (172.21.101.77) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 9 Jan 2020 22:20:25 -0800 Received: from mtkcas09.mediatek.inc (172.21.101.178) by mtkmbs02n1.mediatek.inc (172.21.101.77) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 10 Jan 2020 14:18:47 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas09.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Fri, 10 Jan 2020 14:20:24 +0800 Message-ID: <1578637185.29400.3.camel@mtksdaap41> Subject: Re: [PATCH] drm/mediatek: check for comp->funcs From: CK Hu To: Hsin-Yi Wang Date: Fri, 10 Jan 2020 14:19:45 +0800 In-Reply-To: <20200109072900.17988-1-hsinyi@chromium.org> References: <20200109072900.17988-1-hsinyi@chromium.org> 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-20200109_223002_754966_A17C232D X-CRM114-Status: GOOD ( 14.85 ) 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, Hsin-yi: On Thu, 2020-01-09 at 15:29 +0800, Hsin-Yi Wang wrote: > There might be some comp that doesn't have funcs, eg. hdmi-connector. > Check for comp->funcs otherwise there will be NULL pointer dereference > crash. > > Fixes: bd3de8cd782b ("drm/mediatek: Add gamma property according to hardware capability") > Fixes: 7395eab077f9 ("drm/mediatek: Add ctm property support") Because the fixed patches are still in my tree, so I merge this patch with the fixed patches in mediatek-drm-next-5.6 [1]. [1] https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-next-5.6 Regards, CK > Signed-off-by: Hsin-Yi Wang > --- > This patch is based on mediatek's drm branch: > https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-next-5.6 > > After > https://patchwork.freedesktop.org/patch/344477/?series=63328&rev=59, > there will also be funcs for hdmi-connector. > --- > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > index fb142fcfc353..7b392d6c71cc 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > @@ -808,11 +808,13 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, > > mtk_crtc->ddp_comp[i] = comp; > > - if (comp->funcs->ctm_set) > - has_ctm = true; > + if (comp->funcs) { > + if (comp->funcs->ctm_set) > + has_ctm = true; > > - if (comp->funcs->gamma_set) > - gamma_lut_size = MTK_LUT_SIZE; > + if (comp->funcs->gamma_set) > + gamma_lut_size = MTK_LUT_SIZE; > + } > } > > for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) _______________________________________________ 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 6FCDDC33CA3 for ; Fri, 10 Jan 2020 06:20:00 +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 2F95920673 for ; Fri, 10 Jan 2020 06:20:00 +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="C1L+sKks" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2F95920673 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 057B26E98C; Fri, 10 Jan 2020 06:19:59 +0000 (UTC) Received: from mailgw01.mediatek.com (unknown [210.61.82.183]) by gabe.freedesktop.org (Postfix) with ESMTP id 0E8346E98C for ; Fri, 10 Jan 2020 06:19:57 +0000 (UTC) X-UUID: 8ca12080878f42b4a5f4715cd583c413-20200110 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=2hX33a9oKQvAaZtJ3NQ0cW54cICk0Docx++JIfjlN54=; b=C1L+sKksrUCaSk1L4aeeOVIVRwEj1HUrt9aleg63TRWpo7VBpUS81ERuh3PNSUunD9Xu1wprIqEyvlTGUgv9u46+P+pc5ZtS6J/CrC9/cU+QCMQc5rn+h0O25Y2pUfHBO53nYFXa68rXi9isephJKUdMzm32vi13QPLKNVRvKQI=; X-UUID: 8ca12080878f42b4a5f4715cd583c413-20200110 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 294544061; Fri, 10 Jan 2020 14:19:53 +0800 Received: from mtkcas09.mediatek.inc (172.21.101.178) by mtkmbs02n1.mediatek.inc (172.21.101.77) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 10 Jan 2020 14:18:47 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas09.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Fri, 10 Jan 2020 14:20:24 +0800 Message-ID: <1578637185.29400.3.camel@mtksdaap41> Subject: Re: [PATCH] drm/mediatek: check for comp->funcs From: CK Hu To: Hsin-Yi Wang Date: Fri, 10 Jan 2020 14:19:45 +0800 In-Reply-To: <20200109072900.17988-1-hsinyi@chromium.org> References: <20200109072900.17988-1-hsinyi@chromium.org> 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, Hsin-yi: On Thu, 2020-01-09 at 15:29 +0800, Hsin-Yi Wang wrote: > There might be some comp that doesn't have funcs, eg. hdmi-connector. > Check for comp->funcs otherwise there will be NULL pointer dereference > crash. > > Fixes: bd3de8cd782b ("drm/mediatek: Add gamma property according to hardware capability") > Fixes: 7395eab077f9 ("drm/mediatek: Add ctm property support") Because the fixed patches are still in my tree, so I merge this patch with the fixed patches in mediatek-drm-next-5.6 [1]. [1] https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-next-5.6 Regards, CK > Signed-off-by: Hsin-Yi Wang > --- > This patch is based on mediatek's drm branch: > https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-next-5.6 > > After > https://patchwork.freedesktop.org/patch/344477/?series=63328&rev=59, > there will also be funcs for hdmi-connector. > --- > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > index fb142fcfc353..7b392d6c71cc 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > @@ -808,11 +808,13 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, > > mtk_crtc->ddp_comp[i] = comp; > > - if (comp->funcs->ctm_set) > - has_ctm = true; > + if (comp->funcs) { > + if (comp->funcs->ctm_set) > + has_ctm = true; > > - if (comp->funcs->gamma_set) > - gamma_lut_size = MTK_LUT_SIZE; > + if (comp->funcs->gamma_set) > + gamma_lut_size = MTK_LUT_SIZE; > + } > } > > for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) _______________________________________________ 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 58BE1C33C99 for ; Fri, 10 Jan 2020 06:19:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 244D720673 for ; Fri, 10 Jan 2020 06:19:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="C1L+sKks" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731460AbgAJGT6 (ORCPT ); Fri, 10 Jan 2020 01:19:58 -0500 Received: from mailgw01.mediatek.com ([210.61.82.183]:11573 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1725797AbgAJGT6 (ORCPT ); Fri, 10 Jan 2020 01:19:58 -0500 X-UUID: 8ca12080878f42b4a5f4715cd583c413-20200110 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=2hX33a9oKQvAaZtJ3NQ0cW54cICk0Docx++JIfjlN54=; b=C1L+sKksrUCaSk1L4aeeOVIVRwEj1HUrt9aleg63TRWpo7VBpUS81ERuh3PNSUunD9Xu1wprIqEyvlTGUgv9u46+P+pc5ZtS6J/CrC9/cU+QCMQc5rn+h0O25Y2pUfHBO53nYFXa68rXi9isephJKUdMzm32vi13QPLKNVRvKQI=; X-UUID: 8ca12080878f42b4a5f4715cd583c413-20200110 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 294544061; Fri, 10 Jan 2020 14:19:53 +0800 Received: from mtkcas09.mediatek.inc (172.21.101.178) by mtkmbs02n1.mediatek.inc (172.21.101.77) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 10 Jan 2020 14:18:47 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas09.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Fri, 10 Jan 2020 14:20:24 +0800 Message-ID: <1578637185.29400.3.camel@mtksdaap41> Subject: Re: [PATCH] drm/mediatek: check for comp->funcs From: CK Hu To: Hsin-Yi Wang CC: Philipp Zabel , David Airlie , Matthias Brugger , , , , Date: Fri, 10 Jan 2020 14:19:45 +0800 In-Reply-To: <20200109072900.17988-1-hsinyi@chromium.org> References: <20200109072900.17988-1-hsinyi@chromium.org> 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 SGksIEhzaW4teWk6DQoNCk9uIFRodSwgMjAyMC0wMS0wOSBhdCAxNToyOSArMDgwMCwgSHNpbi1Z aSBXYW5nIHdyb3RlOg0KPiBUaGVyZSBtaWdodCBiZSBzb21lIGNvbXAgdGhhdCBkb2Vzbid0IGhh dmUgZnVuY3MsIGVnLiBoZG1pLWNvbm5lY3Rvci4NCj4gQ2hlY2sgZm9yIGNvbXAtPmZ1bmNzIG90 aGVyd2lzZSB0aGVyZSB3aWxsIGJlIE5VTEwgcG9pbnRlciBkZXJlZmVyZW5jZQ0KPiBjcmFzaC4N Cj4gDQo+IEZpeGVzOiBiZDNkZThjZDc4MmIgKCJkcm0vbWVkaWF0ZWs6IEFkZCBnYW1tYSBwcm9w ZXJ0eSBhY2NvcmRpbmcgdG8gaGFyZHdhcmUgY2FwYWJpbGl0eSIpDQo+IEZpeGVzOiA3Mzk1ZWFi MDc3ZjkgKCJkcm0vbWVkaWF0ZWs6IEFkZCBjdG0gcHJvcGVydHkgc3VwcG9ydCIpDQoNCkJlY2F1 c2UgdGhlIGZpeGVkIHBhdGNoZXMgYXJlIHN0aWxsIGluIG15IHRyZWUsIHNvIEkgbWVyZ2UgdGhp cyBwYXRjaA0Kd2l0aCB0aGUgZml4ZWQgcGF0Y2hlcyBpbiBtZWRpYXRlay1kcm0tbmV4dC01LjYg WzFdLg0KDQpbMV0NCmh0dHBzOi8vZ2l0aHViLmNvbS9ja2h1LW1lZGlhdGVrL2xpbnV4LmdpdC10 YWdzL2NvbW1pdHMvbWVkaWF0ZWstZHJtLW5leHQtNS42DQoNClJlZ2FyZHMsDQpDSw0KDQo+IFNp Z25lZC1vZmYtYnk6IEhzaW4tWWkgV2FuZyA8aHNpbnlpQGNocm9taXVtLm9yZz4NCj4gLS0tDQo+ IFRoaXMgcGF0Y2ggaXMgYmFzZWQgb24gbWVkaWF0ZWsncyBkcm0gYnJhbmNoOg0KPiBodHRwczov L2dpdGh1Yi5jb20vY2todS1tZWRpYXRlay9saW51eC5naXQtdGFncy9jb21taXRzL21lZGlhdGVr LWRybS1uZXh0LTUuNg0KPiANCj4gQWZ0ZXINCj4gaHR0cHM6Ly9wYXRjaHdvcmsuZnJlZWRlc2t0 b3Aub3JnL3BhdGNoLzM0NDQ3Ny8/c2VyaWVzPTYzMzI4JnJldj01OSwNCj4gdGhlcmUgd2lsbCBh bHNvIGJlIGZ1bmNzIGZvciBoZG1pLWNvbm5lY3Rvci4NCj4gLS0tDQo+ICBkcml2ZXJzL2dwdS9k cm0vbWVkaWF0ZWsvbXRrX2RybV9jcnRjLmMgfCAxMCArKysrKystLS0tDQo+ICAxIGZpbGUgY2hh bmdlZCwgNiBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQ0KPiANCj4gZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX2NydGMuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9tZWRpYXRlay9tdGtfZHJtX2NydGMuYw0KPiBpbmRleCBmYjE0MmZjZmMzNTMuLjdiMzkyZDZj NzFjYyAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fY3J0 Yy5jDQo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX2NydGMuYw0KPiBA QCAtODA4LDExICs4MDgsMTMgQEAgaW50IG10a19kcm1fY3J0Y19jcmVhdGUoc3RydWN0IGRybV9k ZXZpY2UgKmRybV9kZXYsDQo+ICANCj4gIAkJbXRrX2NydGMtPmRkcF9jb21wW2ldID0gY29tcDsN Cj4gIA0KPiAtCQlpZiAoY29tcC0+ZnVuY3MtPmN0bV9zZXQpDQo+IC0JCQloYXNfY3RtID0gdHJ1 ZTsNCj4gKwkJaWYgKGNvbXAtPmZ1bmNzKSB7DQo+ICsJCQlpZiAoY29tcC0+ZnVuY3MtPmN0bV9z ZXQpDQo+ICsJCQkJaGFzX2N0bSA9IHRydWU7DQo+ICANCj4gLQkJaWYgKGNvbXAtPmZ1bmNzLT5n YW1tYV9zZXQpDQo+IC0JCQlnYW1tYV9sdXRfc2l6ZSA9IE1US19MVVRfU0laRTsNCj4gKwkJCWlm IChjb21wLT5mdW5jcy0+Z2FtbWFfc2V0KQ0KPiArCQkJCWdhbW1hX2x1dF9zaXplID0gTVRLX0xV VF9TSVpFOw0KPiArCQl9DQo+ICAJfQ0KPiAgDQo+ICAJZm9yIChpID0gMDsgaSA8IG10a19jcnRj LT5kZHBfY29tcF9ucjsgaSsrKQ0KDQo=