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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2382C001E0 for ; Fri, 28 Jul 2023 08:49:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235172AbjG1Itd (ORCPT ); Fri, 28 Jul 2023 04:49:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235164AbjG1ItF (ORCPT ); Fri, 28 Jul 2023 04:49:05 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DEFCA44A5 for ; Fri, 28 Jul 2023 01:48:25 -0700 (PDT) Received: from [192.168.0.125] (unknown [82.76.24.202]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: ehristev) by madras.collabora.co.uk (Postfix) with ESMTPSA id CCE0C660704F; Fri, 28 Jul 2023 09:47:52 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1690534073; bh=EzxFZArV4oI2fCzctc4R32csijV5z1G9a6OEFqMajKI=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=CW5upOAAhgUwkGCV5r+QGymSnPFnm+8hQNTzW7rtwnnpeu0c7ns2vFKGihPkmHu67 MOduQZnPu4kwGX2Wu9GpBHMqttajI0/6o5SV8a0vWDikM28OSAAqwFo0wEsyE+QZUQ Cxy8QP+UprSOBhJxTXSXgu6Kr7wwzCjeb8l6a5Raz1eCZwIP4sE/uFfaKCNnw252Hj q7oVDVSj7YXv6gTespMznLI0JHusPSaAp9pMJhWO1d+rW6p8YiGj0eL4tnNvO90hxy bhIBPQOH4H1FffP+ud6f7tzOwtKiclNby6V/RViHB8Z8zfDLZG5ZrGDOn0vu2AfKPH U+94D5K67kZhQ== Message-ID: Date: Fri, 28 Jul 2023 11:47:49 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [PATCH v7 2/4] drm/mediatek: Fix using wrong drm private data to bind mediatek-drm Content-Language: en-US To: "Jason-JH.Lin" , Chun-Kuang Hu , AngeloGioacchino Del Regno Cc: Matthias Brugger , Jason-ch Chen , Johnson Wang , Singo Chang , Nancy Lin , Shawn Sung , dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Project_Global_Chrome_Upstream_Group@mediatek.com References: <20230727164114.20638-1-jason-jh.lin@mediatek.com> <20230727164114.20638-3-jason-jh.lin@mediatek.com> From: Eugen Hristev In-Reply-To: <20230727164114.20638-3-jason-jh.lin@mediatek.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 7/27/23 19:41, Jason-JH.Lin wrote: > Add checking the length of each data path before assigning drm private > data into all_drm_priv array. > > Fixes: 1ef7ed48356c ("drm/mediatek: Modify mediatek-drm for mt8195 multi mmsys support") > Signed-off-by: Jason-JH.Lin > --- > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 16 +++++++++++++--- > 1 file changed, 13 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > index 249c9fd6347e..d2fb1fb4e682 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > @@ -351,6 +351,7 @@ static bool mtk_drm_get_all_drm_priv(struct device *dev) > { > struct mtk_drm_private *drm_priv = dev_get_drvdata(dev); > struct mtk_drm_private *all_drm_priv[MAX_CRTC]; > + struct mtk_drm_private *temp_drm_priv; > struct device_node *phandle = dev->parent->of_node; > const struct of_device_id *of_id; > struct device_node *node; > @@ -373,9 +374,18 @@ static bool mtk_drm_get_all_drm_priv(struct device *dev) > if (!drm_dev || !dev_get_drvdata(drm_dev)) > continue; > > - all_drm_priv[cnt] = dev_get_drvdata(drm_dev); > - if (all_drm_priv[cnt] && all_drm_priv[cnt]->mtk_drm_bound) > - cnt++; > + temp_drm_priv = dev_get_drvdata(drm_dev); > + if (temp_drm_priv) { > + if (temp_drm_priv->mtk_drm_bound) > + cnt++; > + > + if (temp_drm_priv->data->main_len) > + all_drm_priv[0] = temp_drm_priv; > + else if (temp_drm_priv->data->ext_len) > + all_drm_priv[1] = temp_drm_priv; > + else if (temp_drm_priv->data->third_len) > + all_drm_priv[2] = temp_drm_priv; > + } Previously the code was assigning stuff into all_drm_priv[cnt] and incrementing it. With your change, it assigns to all_drm_priv[0], [1], [2]. Is this what you intended ? If this loop has second run, you will reassign to all_drm_priv again ? I would expect you to take `cnt` into account. Also, is it expected that all_drm_priv has holes in the array ? Eugen > } > > if (drm_priv->data->mmsys_dev_num == cnt) {