Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DACF4289803 for ; Sat, 5 Jul 2025 10:02:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751709760; cv=none; b=AO0Yf6qQCAyR6/KudwjR+grFNCBcJtT3i4SdGbYtCvxJ0eyFi1qcigV47YLm59eAGQ13rvAT7JMxm8+vuMVSoo3TKqSiXsmQLR9K11LGftBgyF8pHCsPrq/7e6rCftDSKkC4xlQIFWPfEwZuB2R6FirH2c9+Yx2Tq0a5Ih57hIU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751709760; c=relaxed/simple; bh=TG9Y97y24HNtxbyFJsoKUMYBT/41NYtNamoIMKjs3K8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lBO/GUcpbBBf9EoqiLOQ3jCK0m7K6r9c72advt6qmRwlnT90ucga6ckt5lTbebIRvBVXa9H5+QMWmwwOIYeFLIc8QfEguZc+kUGhMk5UOF1w3i9/CxQVbVsLiUd1JmHBtUxPU4y88FugTWuY6JA1w3ydyAgb3OJE2sXjEPjYq04= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=MKfI1Qkk; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="MKfI1Qkk" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5658W0OM024289 for ; Sat, 5 Jul 2025 10:02:38 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= h/1nhlqlwpSE5F84bbMtq9GEBT3B7Hx0giikeSnmNeY=; b=MKfI1QkkFRL6fSCy zeOdYCzOi92HVULTqnk4laMKgHcDqDRbAQmzj0sfB9+StFUfirvgF51qMhiAX/wm UAvEKdArHr7UPLmQzR4egnyp/wdYst3Iyj4O7ploY4LL2DZBrxnQsmTbTM/UpA2j UzlIWguAEDOXIoBBJkXCd3ENYdRWrld27004YbE7eGYuGzTtoBlQwOQ2dYFN7yNM IDraD/Bv1EWEwRvYuy3+zKppJ8rvieAi/1V0GlrkzStekg9/Wgd+phZaLUgSbhso LNASMpMXo3qSUd/sXkGxt4NCUQ8lzFqutocAQGtELmiaPINw3/mFU6lWR411dLFD 3CfBhQ== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47pucm8mvh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sat, 05 Jul 2025 10:02:37 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7d3e90c3a81so120474585a.1 for ; Sat, 05 Jul 2025 03:02:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751709757; x=1752314557; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=h/1nhlqlwpSE5F84bbMtq9GEBT3B7Hx0giikeSnmNeY=; b=ePsSBQIXapxca60qQ2fIJlSnUs5ko3qj3djcPDWH5ox6h3VBDr9BIzJ6O6O/p+6hcn rB62kT2/yxB3u+yuisi3p67OV2TGv9mVMXULgXooBRslu/h6ETBjKIpOeDQTNSafUtrS gHfw2JIgL12v6GRO4U04Gu+q0AZAZ/jn0doYsmFu65u6zqq0F1WljbM9V2IrNZajmHV8 /H0kPCyn9mkYwrUTPnDxoliXW0FjdIWU48+6ETStxMgpUi6OKfU9NDeGLbTwlpcdoGsn q4baj3L9GSen6V0wxSnfGtAEKHbrqey0bKvbQ9M8gZ47A2IsrwJeyblPaXivvyb1OMDK 2txg== X-Gm-Message-State: AOJu0Yy6MfG7q2Vpcs1Vzwa5STHkwu0G4inAdKRPXpLIdtQhRAsbOnmy M7hR3uY72BYwgDSU5EvcQsNWIbV0DrnHEVnoKfDtvSpY8kOnu+GA/0cS3S4yLgSx+cyF3YxuW54 8vtb1DrGhwsMZjWhi2Pnw94nLBXFqx3FZ966CbxBe5ffO4xkxqAueLIjpg10zdyhMZqER X-Gm-Gg: ASbGncvsc7beXfI514QIhsraWefk0bnYL7Kc/lwg8vemSK/6Vd8f46QB5BlWNVIdtw3 xMs5nGFdiz2CTUg3j+9pLZXrro8bOua9PG2zdcGBjw7mteW7Vk85eOhR17x2fEYEYYtKbMR6QJt ZKe33y2gqh+NBwN+obr7UGy+lKrr0YNQnPIKf5VSmkactS3auqAy5O/UYSOv834poDbsnX/mUB5 XlRsx/b9y1OiTi6qTzJfatT47jVexOF7XQ7JAUI6OnFLqZhOnp3eJx6/qxhCUYPTZZVrCkK6QqH NCUjr+UUfJXRAxtJofWGcbQ+KAQboc208r5/uFPmKlDwZEkZbhFqJ/4CxREY7XoD+8viF6nSXWt BvLVVXpoo6uN92YK6VZX79uIR4n7iddyPQuw= X-Received: by 2002:a05:620a:410e:b0:7d4:3b3b:20f5 with SMTP id af79cd13be357-7d5df180268mr729964985a.48.1751709756907; Sat, 05 Jul 2025 03:02:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGnwkDUFYmSv6w9LvplPIPGz2sg8KpSYgqXGg0Jgcp8qXdWOYs4owyRO2ecIbVxnhMp5dKn6Q== X-Received: by 2002:a05:620a:410e:b0:7d4:3b3b:20f5 with SMTP id af79cd13be357-7d5df180268mr729957085a.48.1751709756147; Sat, 05 Jul 2025 03:02:36 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-556384c0558sm526274e87.209.2025.07.05.03.02.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Jul 2025 03:02:34 -0700 (PDT) From: Dmitry Baryshkov Date: Sat, 05 Jul 2025 13:02:27 +0300 Subject: [PATCH v4 02/10] drm/msm: move helper calls to msm_kms.c Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250705-msm-gpu-split-v4-2-fb470c481131@oss.qualcomm.com> References: <20250705-msm-gpu-split-v4-0-fb470c481131@oss.qualcomm.com> In-Reply-To: <20250705-msm-gpu-split-v4-0-fb470c481131@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Abhinav Kumar X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3498; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=TG9Y97y24HNtxbyFJsoKUMYBT/41NYtNamoIMKjs3K8=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQ0bGD+NpfuVMXE8qXWfIlP5WzkqwFZsXN2PHmgTpH/N4+ pxi40Q6GY1ZGBi5GGTFFFl8ClqmxmxKDvuwY2o9zCBWJpApDFycAjCRH+4cDGsOvWpX+PVAsze+ zNje906pj+PVZaer58Y0e/7heqm3Kmj2lzzf19yTe1ZsKko+7OJs2P/H3MKBL6xWL+FeidlXFla zsys1dS9knpm++CCn2qQtb6zDN9u5FfwJP5GY5pkmwBfJL5hUKXii2F1wssmMC+aBwmum/ma3ji 1jMiyJMjulqnfKmS/Hqs044d2pYMb3BtKvP83/JHLvpa6ab63tprZfPM1f0/8yzA5QOrdxYWp+X WJKymV2r2Mv1m5Vc+RQmnFiD5e9TJVgf/NVEXEph2Im0aN5yjGuLel/A8TLA79M1V5/6fa3k09n hS7WkVxxpin/h7uSuNnnsr76ecc+CHJHurNYZf3TNwIA X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=GdQXnRXL c=1 sm=1 tr=0 ts=6868f83d cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=5yuRF9vT8A_X6ws8YtoA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-GUID: ShTpbuXr2kKl19A78g9gRXeUgRmn5EdU X-Proofpoint-ORIG-GUID: ShTpbuXr2kKl19A78g9gRXeUgRmn5EdU X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzA1MDA2NCBTYWx0ZWRfX6aZTsL26bqDa +i91QzTMeb00zqlfWV7Yxf/eGdvPwWe5ojW0KcrgniFTLRWMwp3NqV7giOFx09b6qw4XqM3WmwD k8U+DJmaShYnvNSdhKUr2MkurHuIXou/023wT+n97rKz+wUm+ylvF091NmOaduwc2ejs+htr+Ud g0hsGisyA4SXf6UgXiR9Zatdh4AxUC7NGd2o2hPqf5TETuibJ6NL0IbcyUWmUhNh7oNKbE9PT/S npuBKvSKizgcQGF5TLVHOilRoMWAYgriwmbQcoNQPjBLJUBQS5UBb6MgCrlBV5BKHUcXpICsSJU /3Hvmp2eFYvgmbJ/VaUZ+gMAqfB9Dxu8XTY3r00zegumu0yIEyJMTj3Jmxef8DyFjsbKpInMPhi WkQouVcGfUMTgHbKTlw04Rb9iaBS+YXWWlNfSkIbFcncgDIlwII1dXNICPFBYtYfBHHiWXRI X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-04_07,2025-07-04_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 adultscore=0 bulkscore=0 clxscore=1015 spamscore=0 suspectscore=0 mlxlogscore=999 priorityscore=1501 impostorscore=0 malwarescore=0 mlxscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507050064 Extract two more KMS-related codepieces to msm_kms.c, removing last pieces of KMS code from msm_drv.c. Reviewed-by: Abhinav Kumar Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/msm_drv.c | 9 +++------ drivers/gpu/drm/msm/msm_kms.c | 20 ++++++++++++++++++++ drivers/gpu/drm/msm/msm_kms.h | 2 ++ 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 8f79f5b9a61eb39dbd63b4ff225b96e63ee9a5dd..ce22d96033c8efe9210436eff8241f52d3c053bd 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -11,7 +11,6 @@ #include #include -#include #include #include #include @@ -74,7 +73,7 @@ static int msm_drm_uninit(struct device *dev) if (ddev->registered) { drm_dev_unregister(ddev); if (priv->kms) - drm_atomic_helper_shutdown(ddev); + msm_drm_kms_unregister(dev); } msm_gem_shrinker_cleanup(ddev); @@ -167,10 +166,8 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) if (ret) goto err_msm_uninit; - if (priv->kms_init) { - drm_kms_helper_poll_init(ddev); - drm_client_setup(ddev, NULL); - } + if (priv->kms_init) + msm_drm_kms_post_init(dev); return 0; diff --git a/drivers/gpu/drm/msm/msm_kms.c b/drivers/gpu/drm/msm/msm_kms.c index c6c4d3a89ba829e161b060b52c91f5323cb5a806..9541dd7f56c9ea0f1d63c77b8ad8e7bc8cb46508 100644 --- a/drivers/gpu/drm/msm/msm_kms.c +++ b/drivers/gpu/drm/msm/msm_kms.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "disp/msm_disp_snapshot.h" #include "msm_drv.h" @@ -217,6 +218,15 @@ struct drm_gpuvm *msm_kms_init_vm(struct drm_device *dev) return vm; } +void msm_drm_kms_unregister(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct msm_drm_private *priv = platform_get_drvdata(pdev); + struct drm_device *ddev = priv->dev; + + drm_atomic_helper_shutdown(ddev); +} + void msm_drm_kms_uninit(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); @@ -366,3 +376,13 @@ void msm_kms_shutdown(struct platform_device *pdev) if (drm && drm->registered && priv->kms) drm_atomic_helper_shutdown(drm); } + +void msm_drm_kms_post_init(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct msm_drm_private *priv = platform_get_drvdata(pdev); + struct drm_device *ddev = priv->dev; + + drm_kms_helper_poll_init(ddev); + drm_client_setup(ddev, NULL); +} diff --git a/drivers/gpu/drm/msm/msm_kms.h b/drivers/gpu/drm/msm/msm_kms.h index e48529c0a1554e8b9bf477dd71f59286b388de73..7ecf420d0f16cd68f8f7fd99c52e994fe604851f 100644 --- a/drivers/gpu/drm/msm/msm_kms.h +++ b/drivers/gpu/drm/msm/msm_kms.h @@ -200,6 +200,8 @@ static inline void msm_kms_destroy(struct msm_kms *kms) for_each_if (drm_crtc_mask(crtc) & (crtc_mask)) int msm_drm_kms_init(struct device *dev, const struct drm_driver *drv); +void msm_drm_kms_post_init(struct device *dev); +void msm_drm_kms_unregister(struct device *dev); void msm_drm_kms_uninit(struct device *dev); #endif /* __MSM_KMS_H__ */ -- 2.39.5