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 AA405C00140 for ; Wed, 24 Aug 2022 17:21:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233768AbiHXRU7 (ORCPT ); Wed, 24 Aug 2022 13:20:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234967AbiHXRU6 (ORCPT ); Wed, 24 Aug 2022 13:20:58 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92A5274DC6 for ; Wed, 24 Aug 2022 10:20:57 -0700 (PDT) Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 27OF0ssx003838; Wed, 24 Aug 2022 17:20:52 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=qcppdkim1; bh=Css+uKhVGF55AsE1CKgRMtzaiOxuek4xfE7Si47H1Ts=; b=Zvh5mzm+odAxDQjp9X69oa76ufDWrVitxXfK9/8ZkMWPGD5voon5n45E0+Yz4ap1q8cx 4XBwhMagID0Wjzj5JdS76krJxDU51zrGFqd51AL9yQNQLcRaJpZTiXE8af1xGTxvlsLd An9pSDVVBA/ImGgzOEzLeJfZa5GvV/HjUlfc9sofMMnaPxJxC/o7WDv5mWH2Xqqrjkvl hgUvNdkScSfnwGbsPRyQAIiTP1Q4sKKPLGJ4lb/LLE3SFV4IfDo9qpC46jPc9MvfhntT CA8gI2vGv2cpRN8gM0QbO3TAa0exyVtPzA4S/FAWd9XUYExUSfWePzPZYiq3Acb9Owhi 5w== Received: from nalasppmta02.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3j52pqm41n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 24 Aug 2022 17:20:52 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA02.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 27OHKpYh002470 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 24 Aug 2022 17:20:51 GMT Received: from [10.111.161.24] (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.29; Wed, 24 Aug 2022 10:20:48 -0700 Message-ID: <7bdfc4da-740b-9e4d-647c-a349b0bfa1f9@quicinc.com> Date: Wed, 24 Aug 2022 10:20:46 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.2 Subject: Re: [PATCH v1 1/4] drm/msm/mdp5: stop overriding drvdata Content-Language: en-US To: Dmitry Baryshkov CC: Rob Clark , Sean Paul , Stephen Boyd , David Airlie , Daniel Vetter , Bjorn Andersson , , , References: <20220620213054.1872954-1-dmitry.baryshkov@linaro.org> <20220620213054.1872954-2-dmitry.baryshkov@linaro.org> <251f0ce1-05cd-548e-9253-82adbc1038ce@quicinc.com> From: Abhinav Kumar In-Reply-To: Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: vupg-SPU826OawGFh8qQza3Hc-xwYTiz X-Proofpoint-GUID: vupg-SPU826OawGFh8qQza3Hc-xwYTiz X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-08-24_10,2022-08-22_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 bulkscore=0 phishscore=0 mlxlogscore=999 clxscore=1015 malwarescore=0 lowpriorityscore=0 impostorscore=0 suspectscore=0 spamscore=0 mlxscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2207270000 definitions=main-2208240064 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 8/24/2022 1:29 AM, Dmitry Baryshkov wrote: > On Wed, 24 Aug 2022 at 04:25, Abhinav Kumar wrote: >> >> >> >> On 6/20/2022 2:30 PM, Dmitry Baryshkov wrote: >>> The rest of the code expects that master's device drvdata is the >>> struct msm_drm_private instance. Do not override the mdp5's drvdata. >>> >>> Fixes: 6874f48bb8b0 ("drm/msm: make mdp5/dpu devices master components") >>> Signed-off-by: Dmitry Baryshkov >> >> Is this just for consistency across mdp5/dpu drivers? >> >> What issue was seen if mdp5's platform data is overwritten? > > I think there was a crash in mdp5_destroy, but I did not capture the > log at the moment. > > As you can see, the mdp5_destroy() expects to get mdp5_kms pointer > from the drvdata. However the msm_drv_probe sets the drvdata to > msm_drm_private instance. Boom. Yes, I see that msm_drv_probe sets the drvdata to msm_drm_private. But I also see that mdp5_init then sets it to platform_set_drvdata(pdev, mdp5_kms); Does this not override it then? Also seems like the commit which introduced it is present since april, this should have happened even earlier then right? > >> >>> --- >>> drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 19 +++++++++---------- >>> 1 file changed, 9 insertions(+), 10 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c >>> index c668a4b27cc6..daf5b5ca7233 100644 >>> --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c >>> +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c >>> @@ -203,7 +203,7 @@ static int mdp5_set_split_display(struct msm_kms *kms, >>> slave_encoder); >>> } >>> >>> -static void mdp5_destroy(struct platform_device *pdev); >>> +static void mdp5_destroy(struct mdp5_kms *mdp5_kms); >>> >>> static void mdp5_kms_destroy(struct msm_kms *kms) >>> { >>> @@ -223,7 +223,7 @@ static void mdp5_kms_destroy(struct msm_kms *kms) >>> } >>> >>> mdp_kms_destroy(&mdp5_kms->base); >>> - mdp5_destroy(mdp5_kms->pdev); >>> + mdp5_destroy(mdp5_kms); >>> } >>> >>> #ifdef CONFIG_DEBUG_FS >>> @@ -651,9 +651,8 @@ static int mdp5_kms_init(struct drm_device *dev) >>> return ret; >>> } >>> >>> -static void mdp5_destroy(struct platform_device *pdev) >>> +static void mdp5_destroy(struct mdp5_kms *mdp5_kms) >>> { >>> - struct mdp5_kms *mdp5_kms = platform_get_drvdata(pdev); >>> int i; >>> >>> if (mdp5_kms->ctlm) >>> @@ -667,7 +666,7 @@ static void mdp5_destroy(struct platform_device *pdev) >>> kfree(mdp5_kms->intfs[i]); >>> >>> if (mdp5_kms->rpm_enabled) >>> - pm_runtime_disable(&pdev->dev); >>> + pm_runtime_disable(&mdp5_kms->pdev->dev); >>> >>> drm_atomic_private_obj_fini(&mdp5_kms->glob_state); >>> drm_modeset_lock_fini(&mdp5_kms->glob_state_lock); >>> @@ -816,8 +815,6 @@ static int mdp5_init(struct platform_device *pdev, struct drm_device *dev) >>> goto fail; >>> } >>> >>> - platform_set_drvdata(pdev, mdp5_kms); >>> - >>> spin_lock_init(&mdp5_kms->resource_lock); >>> >>> mdp5_kms->dev = dev; >>> @@ -915,7 +912,7 @@ static int mdp5_init(struct platform_device *pdev, struct drm_device *dev) >>> return 0; >>> fail: >>> if (mdp5_kms) >>> - mdp5_destroy(pdev); >>> + mdp5_destroy(mdp5_kms); >>> return ret; >>> } >>> >>> @@ -975,7 +972,8 @@ static int mdp5_dev_remove(struct platform_device *pdev) >>> static __maybe_unused int mdp5_runtime_suspend(struct device *dev) >>> { >>> struct platform_device *pdev = to_platform_device(dev); >>> - struct mdp5_kms *mdp5_kms = platform_get_drvdata(pdev); >>> + struct msm_drm_private *priv = platform_get_drvdata(pdev); >>> + struct mdp5_kms *mdp5_kms = to_mdp5_kms(to_mdp_kms(priv->kms)); >>> >>> DBG(""); >>> >>> @@ -985,7 +983,8 @@ static __maybe_unused int mdp5_runtime_suspend(struct device *dev) >>> static __maybe_unused int mdp5_runtime_resume(struct device *dev) >>> { >>> struct platform_device *pdev = to_platform_device(dev); >>> - struct mdp5_kms *mdp5_kms = platform_get_drvdata(pdev); >>> + struct msm_drm_private *priv = platform_get_drvdata(pdev); >>> + struct mdp5_kms *mdp5_kms = to_mdp5_kms(to_mdp_kms(priv->kms)); >>> >>> DBG(""); >>> > > >