From nobody Tue Oct 7 23:08:57 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 0AC4A290D8F for ; Sat, 5 Jul 2025 02:47:56 +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=1751683678; cv=none; b=gl1yySVF/GqX1fcZgX4PUhj71Gh+/AqlSdzPXYhHBDcP+2ZCdwoqj9O8EfYkiSaMkYaaHIqaesRpOx9MO8tyn3+T55nP5KkWXIe+lPRVQX1mSd+PCu7KijkM4xrbI+J15NBn8Oj4Z+s+qjeiomiYB9ERBC1mVFQk/AobXI8xnBE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751683678; c=relaxed/simple; bh=fDL72GPzQmQB76txcVyhanNjbzZhYEM9L1c+/7lm29Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=meH66kPNUFwli86PZOIkVAGxrrOPd65EJNdQwdJ98NFlhOYlFL9K1jzbTE+APMQyRBiAjS+b3UupfL3mix1hZBxXeYgqmcumcMwsbyFL2TOmEZ/hhPRiJGiS3GwDWNXbdXmJgGDWQNGn8aeBvaA2pxiwaDZwi1xTAzQDOG8QUXs= 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=d+N3218N; 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="d+N3218N" 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 564M1YX8026531 for ; Sat, 5 Jul 2025 02:47:55 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= zTjSmwSAa6yTDqMZc38W+dUQ/0/X4lOOL/yJxyMBtv0=; b=d+N3218NNejs10ER xkaXR+AMbEGoc8x3xWcwANSFngm7DXtl6DwrCqZTCSrof7+J/26cB9iAxeu7W7bZ wdH405mBgioJ/bGKBkU/JBWqeh1AU+m++kZe/9/W/3f8OO5nKgv0nrSKVL4XGETd 8YavyJStBM1mgOs24uZzbYYwU0BamBN9ByZaXcP/1fkwqBwgduTwdHRr15VCeuKx ooqXHUIv8RZ0e59YfjHELuCeJ7+v3+klsGq2g+T7rYRzUtryC8gxiLlT+P6ovfsw QY5Y4KldLdlzSKh7nF6QWeUjujse5esW/viyEZyDmgULjRIK5I/Y3wfOK0F78JIw +diPPg== 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 47j802cx21-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sat, 05 Jul 2025 02:47:55 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7d09bc05b77so225222085a.1 for ; Fri, 04 Jul 2025 19:47:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751683675; x=1752288475; 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=zTjSmwSAa6yTDqMZc38W+dUQ/0/X4lOOL/yJxyMBtv0=; b=stf+7+WIpaH1c3+LOjkw9zrom/z9lM94u52jHCB+LUNzvY2ddd8D11I4uDutUAo32r BZqpeFZQlvKdA9Tq0PvbJbV4WJvpQG1ROOXgrVxumo4U7ank0vjCePKqo3QzlUy7PS8l VZXrM+BqjsOyRJq6niQDY+xgN0Vtd0gbDi0q1Ca8jex67SQqe/1qbq8e5EATgYjySedv mTDNDD8xURysGBynwX9t59RlwCPpQZYxIgra19Hw43SH+a2awXuOq3FSSTq5zsKLcwQE 9airlgEgTsofexNwpRmSR271WEz2mLZ7LuJ8E0SB5CfEok6x2c072jVQ0wJcdhuAo0aD yKiA== X-Forwarded-Encrypted: i=1; AJvYcCUe3IuirU64mCjW+IrQFy8yBCdeN1xqHuHX7KxavlFlIjZkDUYuWOLaz4qH4kSpHEleviEcgBLbYMectWQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwqTRHPJGmNEpDcAKjnUKqTCnvIWLZLDJhVTJi+gpej/NBPdZyQ zLV4Ujlg3LqpcENW9rfN3D3lQl8TR9jaQ/BpTZs3oqm0LME1YR7YhmhAX8WNL0WDRW/bMpkSE4F 7nfCjRyx+2qyBmXEhy+15T9+BcHBEcAwEsi1rOSH6/Dyl0d+bPuJIj01atx0w7SkQV6c= X-Gm-Gg: ASbGncta1qV6p242zLXZkNwGpUuCpVrdEqm4Adg1VPj23HLEjjpuJjLGCna4D8XXAG9 bVFouCwAOL2/Kf70kBuxIbq5thX3X88TljLU8Msjd0XH4YvaDU5fNgnXNpjAYCbU9QHxwGexdvH 6zAF2MG8ITgdEUUIY38GVJUMdnNhdrLPeruIUsFYyjmaPDYDhGe827FgaKKLltTaXbxMXttrg7p V/q5Pt5TXdnjcA8RszeM3lwRWEG8twr2SayQ9VeCG/VR442F+V+gXUkUGh35zr/T994n8RKhxeg 26nDbfbKf5+RVow4+JLw/XcaaEuN3daaN2vsCL8f3/RVZuW6/C1LBEI45vGGbVilo43h9HFL0E7 Ml06eF1CFytiteCPNEEE62W4aYKbli34c2Zs= X-Received: by 2002:a05:620a:700c:b0:7d4:4073:426 with SMTP id af79cd13be357-7d5df102dc3mr488419185a.10.1751683674750; Fri, 04 Jul 2025 19:47:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEZWoviTs93gGJ+j/GTAGiXhkZfv9KNLnpOmGgLc0uLOjEpatwqwW7S5NrlY4NsvIhmzhe8aA== X-Received: by 2002:a05:620a:700c:b0:7d4:4073:426 with SMTP id af79cd13be357-7d5df102dc3mr488416485a.10.1751683674335; Fri, 04 Jul 2025 19:47:54 -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 38308e7fff4ca-32e1b1418b3sm4092411fa.76.2025.07.04.19.47.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Jul 2025 19:47:51 -0700 (PDT) From: Dmitry Baryshkov Date: Sat, 05 Jul 2025 05:47:33 +0300 Subject: [PATCH 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: <20250705-dpu-formats-v1-12-40f0bb31b8c8@oss.qualcomm.com> References: <20250705-dpu-formats-v1-0-40f0bb31b8c8@oss.qualcomm.com> In-Reply-To: <20250705-dpu-formats-v1-0-40f0bb31b8c8@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Jordan Crouse 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=5448; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=fDL72GPzQmQB76txcVyhanNjbzZhYEM9L1c+/7lm29Q=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoaJI+JuKKpLrS7xPn6yJjR0fiUzSkxZGXAE5hY 2m00hGjZ/6JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaGiSPgAKCRCLPIo+Aiko 1dwhB/4sk6Yq70mL9wXivdqGs5Qn4wnldjh+wbzSZ6uuue18KtdcnB3r8u3Bv4r112p2874eJWG n/CYHtGwynhj1QEm0BkY36zZt/76unRomMLpNBRrhiDpK4TI2966d9If24rOK5CkpuWyh1io3rR pnTOTQ/tuVwk3291FcTKgqsydYA7E+c3hst5AgsB0pWOaoO5YxKxKpZDIFpA6ePVoyQDfl7fQVQ Cglxpo948iTaQciBbTvnM+zMdfxgJYE0N/G2xb25CwC6prGS+s35pNxJG1NNHsEpWOg6pcnMGkO vd0zXX923CQCPw/lrqSX3evS1Tej+R7UOBkt+Wxg0jERyFMb X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: MowC6cS_g0H4z5NrFPV3CiV6sG_myrfS X-Authority-Analysis: v=2.4 cv=YPWfyQGx c=1 sm=1 tr=0 ts=6868925b cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=TEkP_0IIR_zyBM1EGkkA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-ORIG-GUID: MowC6cS_g0H4z5NrFPV3CiV6sG_myrfS X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzA1MDAxNyBTYWx0ZWRfX93PNw2bpI2lk AErgtebEIni7dVgZUePqNk47m0HWwHeleWxEWonMvTlaLvqqc/IlPr9X5qLDrb6p9DzabAC5uxp snKCB2S5IZTGlXmFL/onSbJ1ptf2O3j8D0REYsF2yUmgVj3i12k7Iflbjx6kRM2jXY6TEz47zNe rSxKvSbL7X/giycStCJIiq6edOk29If48zsXfpmLWse79EDsMfRu/9wb1+1dpyEW2EgIXSedWBo gdq7obkBDFnBEM2ADx3PwedifaH+nUl1R7i70pLMM8UueQj0LUSr4UQqIgqmempJ7NI2pwbmseU gRWHcr8WDhckL5OSASxG/XLOO3oQagOgHZTnzv8jtyNBT38LbSEzz7HHJYMb+dTIggOn6p7ibYT FsILW5IIJL6+S06Q7F6kcUpju8gtBuimqrW0eERtlqtjoU8HkKPfgiALIAmbQSsV7mzuYkFc 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 spamscore=0 mlxlogscore=840 mlxscore=0 malwarescore=0 suspectscore=0 lowpriorityscore=0 clxscore=1015 impostorscore=0 adultscore=0 priorityscore=1501 bulkscore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507050017 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 | 62 ++++++++++++-------------= ---- 1 file changed, 26 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 67bc5a6eeb43dcf113dea9eccdb778cd52b1ad40..6a0426ed1460c5af4822844d7a7= b0c51739df875 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 /* @@ -80,57 +70,57 @@ static int _dpu_format_populate_plane_sizes_ubwc( fmt->pixel_format =3D=3D DRM_FORMAT_P010) { 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); + stride =3D round_up(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) @@ -139,13 +129,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.39.5