From nobody Tue Dec 16 21:09:29 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 55E172874E4 for ; Fri, 14 Nov 2025 03:44:08 +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=1763091849; cv=none; b=P7d4i0tVLWIMATBiKyPtGgnSB50H9Y/NXQgfvXtM3+Kh1B3quntf7BEMYv0+G43idOtdaNDNJu4Eqjeqfy1qaH6AFfjRiTgNMnF026h84BNL/7va4VjhTih/2lZWgm74kD12fxvEo3xpovfTHM/hpP1BrLDYYN9NdsWf9Rl/HTg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763091849; c=relaxed/simple; bh=VPbylyDBkCJtvEwxDI8LMWIjA3Hoqe2EHamYEMv9eSk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KvKcDpc9E/ZMdL2/qbMIqdfVrg60QcrK4l6PkGMrQ9sGYPNEcZ+GisGdb/b3PPhhnxZrSmj0cmcnk4L7DWg+m6zaOgriQowFIF9fhRPQzWS714X7hsCvy8c2wb5VIul/J5qSx+StLqShngk87J5V0NuWsG6LczcFIMO43ISl69M= 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=Vh92We77; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=TwgCpfpM; 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="Vh92We77"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="TwgCpfpM" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5ADMb1Xo1485460 for ; Fri, 14 Nov 2025 03:44:07 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= dtq0GJ7tV91I/BHHJah0AtaqvF7na51s0A7ny73xl4Q=; b=Vh92We77N5QIZHvZ NSao/Oy+WO94liaviIJC0pRX3Xx3TyKoYy7fy5qnJW0vqCtzZmfa+8PWoomln5yn gKlMZiZIS5yqnS55dKwqrx9Aehv2ApAnG2ynFpuWfkHgb21G5ajI9+QTbKqLalZ3 3ifz+7tsUJu0n0lW7ZOAjt8uROEykG2AMU0GfR0JMIMh+Xd9SSRu6NHXLQG52J6S C0PabpzE5bmA/SJYouqWnj2XWZdT1oJTQ8ElsLotJe8VV0BNF13VMYAI7jWPfYvh 73BNzzad8KWg+rxtheUFcWRzbhDkDR3EmpM98pBVLH1sNpNJs1ftVaqnWb0+9ak4 ej0q4A== Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4adr9hrph1-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 14 Nov 2025 03:44:07 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-882529130acso39393176d6.2 for ; Thu, 13 Nov 2025 19:44:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1763091846; x=1763696646; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=dtq0GJ7tV91I/BHHJah0AtaqvF7na51s0A7ny73xl4Q=; b=TwgCpfpM5T2nx2jr/VaWqwEl0TDoqxzNYzKy5dbSXDE8BMTmy7WevT2OtUJxlvcAi9 6bO2TwgXROhU/MqneGe+Qz2xHndsi1jRmT4RXxC72U3TQlQm2REUyB9pvwAeBM+ZMoIm aF4BZqDpePMVb7+M09CRTMY9ECJKbowAyY3uAITY26yE7jqWw9MfkuHMu2HQyfR111tw F05o00zySwi9Gj2eoI5pDcE+LqialJeKE/IKlaPJSYGE3tNai4xU9AGJqaz6G+XGjbfC cD6qtLOAQlxdw639jflaNKUVGkwPRPiNcBmVjw1RL1XzRKyABRzkMd+hpOahqFLlRMw9 rLpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763091846; x=1763696646; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=dtq0GJ7tV91I/BHHJah0AtaqvF7na51s0A7ny73xl4Q=; b=E8tzj6nDi4uebf2pvft2kCfdwddArvuylVB398pkrB595x0f/CDjJ6oZWL3pFpm3KX 9BnbW+0sCkk/DaajVFQra1gMWqI/zyDYzi5fEN2GEc0OMqGiT1HFvfvhOkSumrcioTy7 t9k0rCkRZ8Kp5o0yQlvv5ZvHTPcj6k8yz2U75BVY9hLpfg3OCa6QFjzW1RclvvSd77Gb yHG+PwRP1H+Rq1cE7WDqpLbvmevIWNw1IEwNLZDrK4q7GdU1f+LZuHeqlQdzNXr4xooP NrJE4T4mNTp+bkKgjbuJ6k74Z6XXhgKwYmDYWOia94saJIfLtk8vcybbmAT11O1kBwqr jD2g== X-Forwarded-Encrypted: i=1; AJvYcCX13uQ5v6XoybvWhnZVgzOeMxsLcwGZI2Wtx9A7PypUk9oVE/Yj9nzA1Q54rL3qHuJJ0a95VDf7g+M9Kgc=@vger.kernel.org X-Gm-Message-State: AOJu0Yy/7Ol5UFmy7d+wBtj5G4W9HW/miOL6GC5bm6vwfD+3KI/lu0PE sdOa/Yec6WoIvRQ0o7KG4Wrcc/n5XmC7P2IZ0EDZ6zb2e8/e/FONMnZkE0iU3ujclrkgARlKKjX uGQPXEMmn48rf6l34L9fEXi4woVkRWGN2L4A2D0NriG9YTo8Qe/DW4oucIiNTcopfrUs= X-Gm-Gg: ASbGncsxTKeeYo4V6Z5VOOAVqu5UQgENUFzx1CVyqVEcutyIHNViMqrXkHyDGGqKJ+Z rk66QuwqHWd5H/m9I5RQSXxxRebHJ6oLLFN5eFKs1oBdDURaOuWS90i5JsI+A6Rw2lqQ8o0zPp4 hHA80+0J/RU7heH40R0up5OJxqZrPbNfWIbGHFVIE5LpKwUOIn/IX5+Q9hozpnjnQo4rJi1G5MO G3GhmAw8Ljc70Fk0rfEdG+8u3QuqbadlNt4UmS3ODQRh2O5X3J875yKjR5GOi3xvXp3s6uaBd2b vPggcXREKK1zZC6KVBDmjiC5YDJCPD5Q2uAqz3kn9X/u8ZAF9PSTiO4F/9mtN+s3DiaWqUFJTvz uOGWAhpirSTsTgIsh4bM9eIaDAlHGCQuWHBfAjT76F/hbCV/SQxsqalVzsp18nIYi4WGDWeXsmh KanWUtk5bSuXgg X-Received: by 2002:a05:6214:1d2f:b0:880:448b:b893 with SMTP id 6a1803df08f44-8829272e198mr23198616d6.50.1763091846302; Thu, 13 Nov 2025 19:44:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IFqUJMLs+6jtwJBpg3Az+p+wGQJe71anyIqFLGvR3+H/KO+e/mxBtEGa6IBNBccwnLxdp6caQ== X-Received: by 2002:a05:6214:1d2f:b0:880:448b:b893 with SMTP id 6a1803df08f44-8829272e198mr23198396d6.50.1763091845851; Thu, 13 Nov 2025 19:44:05 -0800 (PST) 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-5958040575fsm800713e87.84.2025.11.13.19.44.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Nov 2025 19:44:05 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 14 Nov 2025 05:43:39 +0200 Subject: [PATCH v3 12/12] drm/msm/dpu: use standard functions in _dpu_format_populate_plane_sizes_ubwc() 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: <20251114-dpu-formats-v3-12-cae312379d49@oss.qualcomm.com> References: <20251114-dpu-formats-v3-0-cae312379d49@oss.qualcomm.com> In-Reply-To: <20251114-dpu-formats-v3-0-cae312379d49@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Jordan Crouse , Jessica Zhang 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=5431; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=VPbylyDBkCJtvEwxDI8LMWIjA3Hoqe2EHamYEMv9eSk=; b=owEBbAGT/pANAwAKAYs8ij4CKSjVAcsmYgBpFqVmgyV/FfRFGvjtbKAqqM/dmHvibrPtN6W1A VggaMfW43aJATIEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaRalZgAKCRCLPIo+Aiko 1X2aB/dJXBqXc0cvpTNEm+vU5/J7lvSCBS+lJkjb07vkK0rPSF7L/Ly2Lr7TWERkvw9uxbv4D4X ZsaJp6JkFKz9L6pwJOa2hgJpQRHrhWxLu91XedmKyDHfsMP7ynw1cyJckJNX+Gd+sslZihmIfIS w6kSykh0qR6PKbok4UcHqGUaO7fd3Q2okEjAu+1wvG+RyQsMhSGDCtUz3OC557KpGImUueLJAdF L1vaWNorBEtPqOD+aHvYdw9jrG753owQ00ylexKbFXf4x7PFc5PKngh3XXreO59x6qxcDbPprgY uKSVToE0MFlpz7Hd434PVIUWAvtPnbUjyOit0DRDmsg8e0E= X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: bS1kVBhJukgHUO7TpMZ3avnO3q9DrIEI X-Proofpoint-ORIG-GUID: bS1kVBhJukgHUO7TpMZ3avnO3q9DrIEI X-Authority-Analysis: v=2.4 cv=N+Qk1m9B c=1 sm=1 tr=0 ts=6916a587 cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=7bqH7Blup1pqkekdm3wA:9 a=QEXdDO2ut3YA:10 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTE0MDAyNyBTYWx0ZWRfX7WfZk4cOy5lQ 8fsddR9CwB5+4n1r7UVVHpput+AIXuz/TX7Nac9JFuC4ckAYW/Bgxe4dLvhpaLRj74R6JtXQWjs E/zyiS7jpn5zqP42uUctSNOrhpZ2/vJM/qJYOc84bna1n+i8zEw8Hi1N2QmhhFS0DYkfI4qNpZH VcynsFUZy4rH1Y0muKS9XtUIn2D5iHvW98jpMYwfgz9SSsQriCMZpVyccnsZpaN6u7fP4TBUetS +A+FgPdFTMNJUpiugvFEsVPxGKwz7wPxGHnmJN13ekcrkxpHFT19jusnD6wSblxITt6qXVLRSHx 25/j4pG+NpeKsXKkwUrpBYATH9670fi4SpeKH7eRtdh65OD+JeGj4yZTCA8pHd05IOYdcmIcbzn 5L5YzZDkyBj9nAGgm8wSdOXHb3fsxg== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-13_07,2025-11-13_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 priorityscore=1501 spamscore=0 suspectscore=0 impostorscore=0 clxscore=1015 malwarescore=0 bulkscore=0 lowpriorityscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511140027 The _dpu_format_populate_plane_sizes_ubwc() used MSM_MEDIA_ALIGN() and MSM_MEDIA_ROUNDUP(), macros inherited from the previous implementation, msm_media_info.h. Replace them with the standard Linux macros, round_up() and DIV_ROUND_UP() respectively. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 63 +++++++++++++------------= ---- 1 file changed, 27 insertions(+), 36 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c b/drivers/gpu/drm/= msm/disp/dpu1/dpu_formats.c index da1870ce7680899759d09caa01050eeb9844a484..6e8883dbfad439a3b3f07b6fe93= 37820048fc2eb 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c @@ -10,16 +10,6 @@ #include "dpu_kms.h" #include "dpu_formats.h" =20 -#ifndef MSM_MEDIA_ALIGN -#define MSM_MEDIA_ALIGN(__sz, __align) (((__align) & ((__align) - 1)) ?\ - ((((__sz) + (__align) - 1) / (__align)) * (__align)) :\ - (((__sz) + (__align) - 1) & (~((__align) - 1)))) -#endif - -#ifndef MSM_MEDIA_ROUNDUP -#define MSM_MEDIA_ROUNDUP(__sz, __r) (((__sz) + ((__r) - 1)) / (__r)) -#endif - #define DPU_UBWC_PLANE_SIZE_ALIGNMENT 4096 =20 /* @@ -78,56 +68,57 @@ static int _dpu_format_populate_plane_sizes_ubwc( =20 if (MSM_FORMAT_IS_DX(fmt)) { if (fmt->flags & MSM_FORMAT_FLAG_UNPACK_TIGHT) { - stride =3D MSM_MEDIA_ALIGN(fb->width, 192); - stride =3D MSM_MEDIA_ALIGN(stride * 4 / 3, 256); + /* can't use round_up() here because 192 is NPoT */ + stride =3D roundup(fb->width, 192); + stride =3D round_up(stride * 4 / 3, 256); y_tile_width =3D 48; } else { - stride =3D MSM_MEDIA_ALIGN(fb->width * 2, 256); + stride =3D round_up(fb->width * 2, 256); y_tile_width =3D 32; } =20 - sclines =3D MSM_MEDIA_ALIGN(fb->height, 16); + sclines =3D round_up(fb->height, 16); y_tile_height =3D 4; } else { - stride =3D MSM_MEDIA_ALIGN(fb->width, 128); + stride =3D round_up(fb->width, 128); y_tile_width =3D 32; =20 - sclines =3D MSM_MEDIA_ALIGN(fb->height, 32); + sclines =3D round_up(fb->height, 32); y_tile_height =3D 8; } =20 layout->plane_pitch[0] =3D stride; - layout->plane_size[0] =3D MSM_MEDIA_ALIGN(layout->plane_pitch[0] * + layout->plane_size[0] =3D round_up(layout->plane_pitch[0] * sclines, DPU_UBWC_PLANE_SIZE_ALIGNMENT); =20 layout->plane_pitch[1] =3D stride; - layout->plane_size[1] =3D MSM_MEDIA_ALIGN(layout->plane_pitch[1] * + layout->plane_size[1] =3D round_up(layout->plane_pitch[1] * sclines, DPU_UBWC_PLANE_SIZE_ALIGNMENT); =20 if (!meta) return 0; =20 - y_meta_stride =3D MSM_MEDIA_ROUNDUP(fb->width, y_tile_width); - layout->plane_pitch[2] =3D MSM_MEDIA_ALIGN(y_meta_stride, 64); + y_meta_stride =3D DIV_ROUND_UP(fb->width, y_tile_width); + layout->plane_pitch[2] =3D round_up(y_meta_stride, 64); =20 - y_meta_scanlines =3D MSM_MEDIA_ROUNDUP(fb->height, y_tile_height); - y_meta_scanlines =3D MSM_MEDIA_ALIGN(y_meta_scanlines, 16); - layout->plane_size[2] =3D MSM_MEDIA_ALIGN(layout->plane_pitch[2] * + y_meta_scanlines =3D DIV_ROUND_UP(fb->height, y_tile_height); + y_meta_scanlines =3D round_up(y_meta_scanlines, 16); + layout->plane_size[2] =3D round_up(layout->plane_pitch[2] * y_meta_scanlines, DPU_UBWC_PLANE_SIZE_ALIGNMENT); =20 - uv_meta_stride =3D MSM_MEDIA_ROUNDUP((fb->width+1)>>1, y_tile_width / 2); - layout->plane_pitch[3] =3D MSM_MEDIA_ALIGN(uv_meta_stride, 64); + uv_meta_stride =3D DIV_ROUND_UP((fb->width+1)>>1, y_tile_width / 2); + layout->plane_pitch[3] =3D round_up(uv_meta_stride, 64); =20 - uv_meta_scanlines =3D MSM_MEDIA_ROUNDUP((fb->height+1)>>1, y_tile_height= ); - uv_meta_scanlines =3D MSM_MEDIA_ALIGN(uv_meta_scanlines, 16); - layout->plane_size[3] =3D MSM_MEDIA_ALIGN(layout->plane_pitch[3] * + uv_meta_scanlines =3D DIV_ROUND_UP((fb->height+1)>>1, y_tile_height); + uv_meta_scanlines =3D round_up(uv_meta_scanlines, 16); + layout->plane_size[3] =3D round_up(layout->plane_pitch[3] * uv_meta_scanlines, DPU_UBWC_PLANE_SIZE_ALIGNMENT); } else { unsigned int rgb_scanlines, rgb_meta_scanlines, rgb_meta_stride; =20 - layout->plane_pitch[0] =3D MSM_MEDIA_ALIGN(fb->width * fmt->bpp, 256); - rgb_scanlines =3D MSM_MEDIA_ALIGN(fb->height, 16); - layout->plane_size[0] =3D MSM_MEDIA_ALIGN(layout->plane_pitch[0] * + layout->plane_pitch[0] =3D round_up(fb->width * fmt->bpp, 256); + rgb_scanlines =3D round_up(fb->height, 16); + layout->plane_size[0] =3D round_up(layout->plane_pitch[0] * rgb_scanlines, DPU_UBWC_PLANE_SIZE_ALIGNMENT); =20 if (!meta) @@ -136,13 +127,13 @@ static int _dpu_format_populate_plane_sizes_ubwc( /* uAPI leaves plane[1] empty and plane[2] as meta */ layout->num_planes +=3D 1; =20 - rgb_meta_stride =3D MSM_MEDIA_ROUNDUP(fb->width, 16); - layout->plane_pitch[2] =3D MSM_MEDIA_ALIGN(rgb_meta_stride, 64); + rgb_meta_stride =3D DIV_ROUND_UP(fb->width, 16); + layout->plane_pitch[2] =3D round_up(rgb_meta_stride, 64); =20 - rgb_meta_scanlines =3D MSM_MEDIA_ROUNDUP(fb->height, 4); - rgb_meta_scanlines =3D MSM_MEDIA_ALIGN(rgb_meta_scanlines, 16); + rgb_meta_scanlines =3D DIV_ROUND_UP(fb->height, 4); + rgb_meta_scanlines =3D round_up(rgb_meta_scanlines, 16); =20 - layout->plane_size[2] =3D MSM_MEDIA_ALIGN(layout->plane_pitch[2] * + layout->plane_size[2] =3D round_up(layout->plane_pitch[2] * rgb_meta_scanlines, DPU_UBWC_PLANE_SIZE_ALIGNMENT); } =20 --=20 2.47.3