From nobody Tue Oct 7 23:03:50 2025 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 E3A6028B7CC for ; Sat, 5 Jul 2025 10:02:42 +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=1751709764; cv=none; b=WQBvxhjsftD4zDpLy9kpbZgezDNzZtog5i0zuzNCxW4xwXQFh8r99j0NPq7kZldOvIpUUAdVlsP4AfR3E3UPLWOL+AtMG7duLSljyepM56CJarw8ZmykiqQoJ9MxK+saPK4F33A5FuMEV5ayxwbt1jG5Kho3hWTRU0wgbHvUKtY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751709764; c=relaxed/simple; bh=TPCljJOCE+lAGVk6fcBbNqkJA6qavoaTCAklWifT78M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TFDaw3qrcb2Upl3DToNUjC5z4Wi+k9of9ytqkTg7hs11fPS6XnRQItgYTkXtQtDbz+24cKTY0+fD8fuV3h5Q8VgQF21e1gCqv242P211GhfqCz7eKMby0cFIWZdAUL1j+hxxqUsnYvR0zYW4x2h/5qfiJ5X99z9RlPei9psa6h0= 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=hlxieKwj; 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="hlxieKwj" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5652qrAJ019328 for ; Sat, 5 Jul 2025 10:02:41 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= 4F90/3W/LUSFn38dXcUegvIFvXJs8yXbN6RnwBBqeTQ=; b=hlxieKwjlAhXJ2wM kaSl17R9dNl5jCLRHVouR96BkS6q+FcU83GvxCa500HtX9zVo/IWYT9hVtR9xqV6 XeJ34Gngz9dyxzI4pIHBGB362Q1Di5vJbzvWDenmMrk4bRFqqMB7071oUForoJnB VUq4F+SaVt4Bdb7rwZjFNOth+bHFHX3qGszj9BNOdDSbFh6zUuJB88HU+EWQSMHj Okta6NioMo4Dn1xRX0o5bvODou++SSHDF+hLfwPbDBX9kSp7XszDqmBzCTrHcJ73 vlMWDF8SGTJyUh7TYQC4pizU8Phbuuwk+DaItnBEQhhjzUEaaDBg7FQXjpRnGzyK f8P+Hw== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47pun20mb9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sat, 05 Jul 2025 10:02:41 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7d099c1779dso235680085a.0 for ; Sat, 05 Jul 2025 03:02:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751709761; x=1752314561; 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=4F90/3W/LUSFn38dXcUegvIFvXJs8yXbN6RnwBBqeTQ=; b=N/SdopBE9412tcgix4JQVRJmx9Innn2GR4NlblwNIgRvbcDvvkr2FMqhzMYlfX0MQc vBxnpqcy1VvWG17VJj177QOMwVu0yppbMI6Bdfi179+72ts8WJsySmvG6opXtu/sEm/o Fme1uI0xn5vXoEWvUroaVy0wSjqcmwxA6shxqBFShSck6lf8SuHX8Jes9KAvL2Pq/pgQ umnyATmgRIB/lck5ZlNpXlNCIqtogXSKQpLEjUm8tYRBzXWJAVY4vTpiXicjryviGP9A Vq6inYhtRvSpUB7QgPG2EqWal4Q+nIvHWZDKQkoJk4vp/o3N9d8xf03ijAbIlAjaha4w ascg== X-Forwarded-Encrypted: i=1; AJvYcCUylsKej2T0f2J6aXSz5q20C+1rZsBBRcIdj9cKdim6LYNqXe4Gr5CLuIjJ0CL3ZqTmG66tGNBCKS9CM8U=@vger.kernel.org X-Gm-Message-State: AOJu0Yys4Bce/nekuig0rWxE1QLiRKWbVn8lvkQ5FatCvqhIJszqVBD3 GjR4NCjHFjRRTuXlJhvwJ1O04O06vm+Mx4/164IInp8ApwkzXLAHBX8GvoY0gZjRt4v9pFe9xvg +yCNASEdBbron13ScV3sHM/GpqIafl2Xkbeyu3WUpkJajTY1CdD1yOrwsEhR5fVhXxrc= X-Gm-Gg: ASbGncsygVDdNGdHpF2qaZ4Tsip0L0ZRlWdhugt2vmk/9zDehHjoxruSl3pp0/SbIO7 DyTw6xnaReAFh7kPbB/HwTBEoj56wDM+/7bazRpcd6+pGoOtBULxi3iolQPx4DQDHYdAFMI6g6W Rpyu1Bxa+gdvetohZ+JvkBtygAyau6wNTrOPhSFZbgCLwswO2qmnMC5Q42Qk8gKUV414QB8dicX pp9z8poN+T3nw5emkihLnXioBShMcenIhOKyBdb/yb6VV5PqQJ3AcPRxdZuoYJfEMZ1NScyPDU5 VB95Qnitml1iQD0l49wfrEip/6ZrDovTPe9rRs+yC0ietZglmp1D5MeoBg0rf1fb9xddmEB4CU6 Jlzy+9grbwST1gd6iGl3mVeWNn9AS1YhZQjU= X-Received: by 2002:a05:620a:2915:b0:7ca:f02a:4d2b with SMTP id af79cd13be357-7d5dcc7295dmr751767685a.12.1751709760469; Sat, 05 Jul 2025 03:02:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGulStBJHLwU8HwDOIF+guVJVHi5pOC4lXhzr0md3WFCORD6oDXM4sw08Hi8v5tjavsA5Phzg== X-Received: by 2002:a05:620a:2915:b0:7ca:f02a:4d2b with SMTP id af79cd13be357-7d5dcc7295dmr751761785a.12.1751709759816; Sat, 05 Jul 2025 03:02:39 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Jul 2025 03:02:38 -0700 (PDT) From: Dmitry Baryshkov Date: Sat, 05 Jul 2025 13:02:29 +0300 Subject: [PATCH v4 04/10] drm/msm: get rid of msm_drm_private::num_crtcs Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250705-msm-gpu-split-v4-4-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 X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4457; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=TPCljJOCE+lAGVk6fcBbNqkJA6qavoaTCAklWifT78M=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoaPgzYU4YT/9DG03zg0Djt3R1PL8JY+Bj6d5l7 Jy5NeZZsRWJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaGj4MwAKCRCLPIo+Aiko 1RNICACdfxbPAPjg77KvBwb9W88X1WwjulbLAGup29/00hSU5LfPUKuPHIC1AGOb47UA8NQkDgU csHLBA/YtesFD/a8GBOrrsPD/+U4hvdxgz1zB7pCYWEaQ6KkaIV8Ik6dYuq+IM9AyFot6npA+3q kNrQyx4GsanMOM/yabLUABnMF+FN6qLhWWIQuVjaylxysF6nfmQacD+bhsGweItMagZdarQN1Ei t7BBFBE6BsX0MzZu655r3l1k5VNRPfEoni093XRWjYqKspik/l318q1/jC97N3ucZBiNrO96DTZ Uvucvl2Bde5N16GieoyH7eLmNenk4HeTMwhg79l4TGcaM9Ko X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: -rtpIjbWoJYEDHk9Qnk5lGd_Lo4xais2 X-Authority-Analysis: v=2.4 cv=GdUXnRXL c=1 sm=1 tr=0 ts=6868f841 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=F-HcN3iq_yGV61sY1bgA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-ORIG-GUID: -rtpIjbWoJYEDHk9Qnk5lGd_Lo4xais2 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzA1MDA2NCBTYWx0ZWRfX6k50yB+bWAUd v2TjDB7jfqKDRHdcCTM/1I8S2O5Jkbi90390WwOWWzJW5tg1iQ1vq4toVwGtjRjFHaF6lxl5ulz N9ntGwK+RnYax1E2s5E+jEyV67A5pfGeRO44GEBphvqDVzWpEy0z4q5YAW3zSg1kxnqWG7ggfXz Tu/1QT40GUYHuNWeRL16LjMObN2zBJUNtFS0Dahz+vGpd8nWborihzmXowiGE+1teFFu3FGYMM1 uTP6zc/HCqCy97Pknx7rrgkr1RnioWPQqHygN1sBfsFtAUNa4xOgOZYOB8JoMnyj8WE42eaUdrx 58STRbE4Jp+B9gBH6lo/a2i18WXQWE+nUnck/SLo24AXXoZluyhqnLw03YWCm/NsHEyJsVg1zPm CvTj8GAuNknlKpumdxNyWMikp69pKrPfFfn3VEKPXSkt6rpQqKNog7dcBbgJILb0FZwSQ3Ys 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 bulkscore=0 spamscore=0 priorityscore=1501 lowpriorityscore=0 clxscore=1015 malwarescore=0 mlxscore=0 phishscore=0 impostorscore=0 suspectscore=0 mlxlogscore=999 adultscore=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 Drop superfluous msm_drm_private::num_crtcs in favour of using drm_mode_config::num_crtc or MAX_CRCS as appropriate. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 3 +-- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 3 --- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 4 +--- drivers/gpu/drm/msm/msm_drv.h | 2 -- drivers/gpu/drm/msm/msm_kms.c | 4 ++-- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/= disp/dpu1/dpu_kms.c index e63a62664f39d73033e65adab5a90fd43c844a78..7025f521b70e501eefa69ddcdba= 64d38e0ca5465 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -875,12 +875,11 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_= kms) ret =3D PTR_ERR(crtc); return ret; } - priv->num_crtcs++; } =20 /* All CRTCs are compatible with all encoders */ drm_for_each_encoder(encoder, dev) - encoder->possible_crtcs =3D (1 << priv->num_crtcs) - 1; + encoder->possible_crtcs =3D (1 << dev->mode_config.num_crtc) - 1; =20 return 0; } diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm= /disp/mdp4/mdp4_kms.c index 6d938abe29ee7283de2b1535d3d0159bf09d6dff..1aa7d65afbd0b4e8a231d1d4ff7= a7120e8b7391e 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c @@ -297,7 +297,6 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4= _kms, static int modeset_init(struct mdp4_kms *mdp4_kms) { struct drm_device *dev =3D mdp4_kms->dev; - struct msm_drm_private *priv =3D dev->dev_private; struct drm_plane *plane; struct drm_crtc *crtc; int i, ret; @@ -347,8 +346,6 @@ static int modeset_init(struct mdp4_kms *mdp4_kms) ret =3D PTR_ERR(crtc); goto fail; } - - priv->num_crtcs++; } =20 /* diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm= /disp/mdp5/mdp5_kms.c index b6e6bd1f95eebf890a8dced129854e8e19e60c9c..4c9e79fc00e9d8ca8de294c8355= 9e72a2e48d1d2 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c @@ -375,7 +375,6 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, static int modeset_init(struct mdp5_kms *mdp5_kms) { struct drm_device *dev =3D mdp5_kms->dev; - struct msm_drm_private *priv =3D dev->dev_private; unsigned int num_crtcs; int i, ret, pi =3D 0, ci =3D 0; struct drm_plane *primary[MAX_BASES] =3D { NULL }; @@ -443,7 +442,6 @@ static int modeset_init(struct mdp5_kms *mdp5_kms) DRM_DEV_ERROR(dev->dev, "failed to construct crtc %d (%d)\n", i, ret); goto fail; } - priv->num_crtcs++; } =20 /* @@ -451,7 +449,7 @@ static int modeset_init(struct mdp5_kms *mdp5_kms) * crtcs for the encoders */ drm_for_each_encoder(encoder, dev) - encoder->possible_crtcs =3D (1 << priv->num_crtcs) - 1; + encoder->possible_crtcs =3D (1 << dev->mode_config.num_crtc) - 1; =20 return 0; =20 diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index 33d668a18ff3613b40341df540d504ffff65b2a7..88ce305792fd89f280b39bd9288= 8a18abd0343e3 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -175,8 +175,6 @@ struct msm_drm_private { struct mutex lock; } lru; =20 - unsigned int num_crtcs; - struct msm_drm_thread event_thread[MAX_CRTCS]; =20 struct notifier_block vmap_notifier; diff --git a/drivers/gpu/drm/msm/msm_kms.c b/drivers/gpu/drm/msm/msm_kms.c index 9541dd7f56c9ea0f1d63c77b8ad8e7bc8cb46508..a63d014c19039835de47fb3fb61= 0ce67652b5d2c 100644 --- a/drivers/gpu/drm/msm/msm_kms.c +++ b/drivers/gpu/drm/msm/msm_kms.c @@ -245,7 +245,7 @@ void msm_drm_kms_uninit(struct device *dev) flush_workqueue(kms->wq); =20 /* clean up event worker threads */ - for (i =3D 0; i < priv->num_crtcs; i++) { + for (i =3D 0; i < MAX_CRTCS; i++) { if (priv->event_thread[i].worker) kthread_destroy_worker(priv->event_thread[i].worker); } @@ -313,7 +313,7 @@ int msm_drm_kms_init(struct device *dev, const struct d= rm_driver *drv) sched_set_fifo(ev_thread->worker->task); } =20 - ret =3D drm_vblank_init(ddev, priv->num_crtcs); + ret =3D drm_vblank_init(ddev, ddev->mode_config.num_crtc); if (ret < 0) { DRM_DEV_ERROR(dev, "failed to initialize vblank\n"); goto err_msm_uninit; --=20 2.39.5