From nobody Fri Oct 3 06:34:59 2025 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 8C5ED1FBCB1 for ; Fri, 5 Sep 2025 00:39:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757032747; cv=none; b=PtlGj5VuyoC+7lKtJGcGFYjqdJpPUm4LOdTAUHwkCCkCAB5HuY9kcPIdfj0zXGzvwePI4bD3d6YjK7GKSRqnpFlvh8vif9rQ135T8XNyrLtBdc2HLSiz0eqQRx02r5ZO54QdbhbOkV60E8GgfUfnxf5wMPAfgPpJtrpKWWa19Uw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757032747; c=relaxed/simple; bh=OXT8W35fr8NRb5cK8/YcdfZIWnqlYhpXdAdC+aSkVY4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Aj9DIZs1FUDExBxp1K3Dmp/XDglE+HdQG1t1tHpngMMK7LF8KiyrIxGhyFHukO555OZVUxBu6HHiBLAPUq+DoRiEgiq9rPK1NVasU9wg1XbLP7RfcIR+YKUWLua1cz13xjO/uo64/oUfzji8BdoDFPzP8BPALyRsV7Aj5bHJDqw= 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=Sq1aP1gp; arc=none smtp.client-ip=205.220.168.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="Sq1aP1gp" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 584I0iG5003019 for ; Fri, 5 Sep 2025 00:39:04 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= 780LqBw/igl19KvLZzHBkwTrlSQvqB3i+oVJRdDf2bQ=; b=Sq1aP1gp1fwQUALp vEMzGBsqZsKBHFJB96qeN8rHajs90m+qGEAvoZnZLiViI6tGXx8TEKqGPC1OkMFv avKXwa0xLyHK2EVuadMlcioTZX+HIa7Bk7Q+9VbX5brbPJiVC9Ii2l69L/s0Ilm6 JNRPxkNifMNoziuwDtyjT8dSaK0cmXajoZLMAxnCPB4dNVzZ0kcQwrSYq0SEGFhm hHoeyaAqW8Fry5B9eBtI7UA2SGqt2ZzJH1Y77EBMChAdkpzcunrVYKnspXxPJrl5 SuyAMwVVwIk5d09Wn30vScaY6PeoSSyD1K7ZTo9AjdQUfvLYfK4ON05u8Apw5lCY GQ2BCQ== Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 48ush395h5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 05 Sep 2025 00:39:04 +0000 (GMT) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-7296c012ec9so13522276d6.2 for ; Thu, 04 Sep 2025 17:39:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757032743; x=1757637543; 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=780LqBw/igl19KvLZzHBkwTrlSQvqB3i+oVJRdDf2bQ=; b=mATrCi7XdPaOCd6XOIfFNcXtvppaVC0zNM4l1ipDImJ2at8dzoPR5d9xuZ6nxi/RPB maAZwtyzvL3km1hxGykfJ42X2kFRCJW4iBoNVnxTT4JZ33UTOWw9kxfFhqi3AMdPohqM O0L4s/lnUERX28WP8hPTHUW9E4cvS9qVhVra9zhOldqFydtVXbuNZj8n8K3z5Bmy5B7o 4E9pPIn1SV8g79UHMMDAJqOFZhoosL+fwa6lM5VZR0pAr3GNshEFJESEHlqKBZyjsg5m MHfLOlzsMc6YLprqlh0uBzrC9kPbjrUTFii5y18HlERJWUvCGcbyY9kI2upc/wHXsH7S nUYQ== X-Forwarded-Encrypted: i=1; AJvYcCWBj/YBEKXE7zWvhtqt0JnHEQdX/lvNhJlgWr7GUkWCVcZtHnuf4Fg3hl0qp6QqVrPIVp4S5rIxcnhIzjM=@vger.kernel.org X-Gm-Message-State: AOJu0Yzupi8dl8dfciiRawPFYBYHsZdZGKZ2k1fTeVCxGbDNzxfy/73S pq58VV+91Fp1sAQi9DqCV3YhsI8vW8iafuXuhx1RG3X7tAzOXR0ugZm8fSRfVJRlrCsYn6Ac0Az FOK2AhDL6vU3tVbFiX+tv0PAdFMxkmI06AtfA1xg2czFH4tgisTnq40ulmnCIlSY1rhA= X-Gm-Gg: ASbGncsi5ZFHlBsU6bqjTFyWh6EvJ08hWDs25szCezmjYp6GiZFZE0RZXSFfNPDDIFd v8A2JRe6OYRkkRAb1O+yC+zku87uF6EbRV3rzmKwTAcs0mxCx8A221Cxi6+NTeme/bkQHj8J/yJ 83sB8179LTm9/8lhvIZoBkRiAqiSSDnakusOM+NfN9CzxsfjQnxUw4yjuJHn9To7XozHXt2IFog If8Qg3pCeJCFqjvULNhuXlxyid5thzkdzO7wFlmDTjwuH0in0u55qHKuX+Qs8NBh7/j8gPCA9Tq dXNEPNW6tLY4yNpvkRGBE1Kqjr9vKugi+1d6uXHSczKNR6S87e/ZJip3x/UEq04KMvyHGJq4Zv+ 2sxGjdOR1qENMX7IjFKnivw9K352L1iIwUzGyQxQggr6NsKJ1EExo X-Received: by 2002:a05:6214:1246:b0:70f:a5ac:2523 with SMTP id 6a1803df08f44-70fac6f87eamr212894746d6.8.1757032743217; Thu, 04 Sep 2025 17:39:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGwBf+0LtBtbgRu0E1FTAsC6WkuuZJqpTq32T+jdGFl1Fr1Nb29VTezSLusCo4cOwNvpilzEQ== X-Received: by 2002:a05:6214:1246:b0:70f:a5ac:2523 with SMTP id 6a1803df08f44-70fac6f87eamr212894416d6.8.1757032742725; Thu, 04 Sep 2025 17:39:02 -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-5608acfd938sm1510059e87.109.2025.09.04.17.38.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Sep 2025 17:39:00 -0700 (PDT) From: Dmitry Baryshkov Date: Fri, 05 Sep 2025 03:38:38 +0300 Subject: [PATCH v2 09/12] drm/msm/dpu: simplify _dpu_format_populate_plane_sizes_* 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: <20250905-dpu-formats-v2-9-7a674028c048@oss.qualcomm.com> References: <20250905-dpu-formats-v2-0-7a674028c048@oss.qualcomm.com> In-Reply-To: <20250905-dpu-formats-v2-0-7a674028c048@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=3791; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=OXT8W35fr8NRb5cK8/YcdfZIWnqlYhpXdAdC+aSkVY4=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoujEKa0UEV5N1PJ2FGbOlxgyrHNBe3+EXnLW0k Q9SKySPhUeJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaLoxCgAKCRCLPIo+Aiko 1Sa7B/46NDpoRmfDw9X+jQuun+Uq4tblfqOV+Cz6n3NLX0f/IMHlvZB5xVjC71QGxPMeSrKnARn 5d+sBTRUFXBTX4maimT1liIpWvmm3mKpZDBxFYWiX29cCc5PjROFZOaFHa0R6+uJDIjNHcsxmVk vkofxm0L6wbR7BdA3GQzfYB3e0F9XWpEUgHcfajiN+0zVsebyGZearoc15GlPoUwChY6jaNdQZp As/qJc9mDGNrhhTXL+Gh6QFsgiEE/yEiwlGT68qL26NRz4SlfVStpAqeyycFAv6kkFMOQGRXOK7 I6sZUAgmupig5tA162CYbW/Y0Au/qEZfvpnc+qons2SxY+QS X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwODMwMDAzMiBTYWx0ZWRfX3FCM74OKPrd9 nZnD3ITIVtdfAV4g+I+QKstWBsCzbliVreCf6DPX64oelyLi89KN83YcMPdhDy/qDKAC+EC99QR hdldCQnOe9xw3ejDmYf/39J2Z0QV4xFwyG11B1VC/iE2hLnbwCfpZZODSJ5nHsyzZcO+A9h0I+9 sFf59W1KteCqjZrGeEQPJ0xjgT/AAJSSm7I8uFqoka7XHQ3DYXy8/+efzao9DoYrEqexSFpwgun 6ozr8MjZmit7Pd6QD/lWJvNZJ6KDOeRsp/5LjTsWzCsEql4BU4fxAz9CmjXjuA6ylx3lQzuokbf A4504SRwHP/VMaaL/pDW0pGg+6pDlJNS4lP4oF1fBNqze9l4beC6fOUaGRHY1vffJ6IWCQYtMp1 5Ye58qTc X-Proofpoint-ORIG-GUID: ZuPMoiK7vSS4NC0ENJ53ui3bjb0Ume8q X-Proofpoint-GUID: ZuPMoiK7vSS4NC0ENJ53ui3bjb0Ume8q X-Authority-Analysis: v=2.4 cv=M9NNKzws c=1 sm=1 tr=0 ts=68ba3128 cx=c_pps a=wEM5vcRIz55oU/E2lInRtA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=yJojWOMRYYMA:10 a=EUspDBNiAAAA:8 a=d-fElJfPDvRUhmvKT08A:9 a=QEXdDO2ut3YA:10 a=OIgjcC2v60KrkQgK7BGD:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-09-04_08,2025-09-04_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 adultscore=0 spamscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 suspectscore=0 phishscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2507300000 definitions=main-2508300032 Move common bits of _dpu_format_populate_plane_sizes_ubwc() and _linear() to dpu_format_populate_plane_sizes(), reducing unnecessary duplication and simplifying code flow fror the UBWC function. Reviewed-by: Jessica Zhang Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 41 +++++++++++++------------= ---- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c b/drivers/gpu/drm/= msm/disp/dpu1/dpu_formats.c index b0d585c5315ca0d459c7ab7f936f1ae350a4a520..b950bc827a36c231bcd4a9374e5= 8cde6b41230bf 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c @@ -95,15 +95,9 @@ static int _dpu_format_populate_plane_sizes_ubwc( struct drm_framebuffer *fb, struct dpu_hw_fmt_layout *layout) { - int i; int color; bool meta =3D MSM_FORMAT_IS_UBWC(fmt); =20 - memset(layout, 0, sizeof(struct dpu_hw_fmt_layout)); - layout->width =3D fb->width; - layout->height =3D fb->height; - layout->num_planes =3D fmt->num_planes; - color =3D _dpu_format_get_media_color_ubwc(fmt); if (color < 0) { DRM_ERROR("UBWC format not supported for fmt: %p4cc\n", @@ -128,7 +122,7 @@ static int _dpu_format_populate_plane_sizes_ubwc( uv_sclines, DPU_UBWC_PLANE_SIZE_ALIGNMENT); =20 if (!meta) - goto done; + return 0; =20 layout->num_planes +=3D 2; layout->plane_pitch[2] =3D VENUS_Y_META_STRIDE(color, fb->width); @@ -152,7 +146,8 @@ static int _dpu_format_populate_plane_sizes_ubwc( rgb_scanlines, DPU_UBWC_PLANE_SIZE_ALIGNMENT); =20 if (!meta) - goto done; + return 0; + layout->num_planes +=3D 2; layout->plane_pitch[2] =3D VENUS_RGB_META_STRIDE(color, fb->width); rgb_meta_scanlines =3D VENUS_RGB_META_SCANLINES(color, fb->height); @@ -160,10 +155,6 @@ static int _dpu_format_populate_plane_sizes_ubwc( rgb_meta_scanlines, DPU_UBWC_PLANE_SIZE_ALIGNMENT); } =20 -done: - for (i =3D 0; i < DPU_MAX_PLANES; i++) - layout->total_size +=3D layout->plane_size[i]; - return 0; } =20 @@ -174,11 +165,6 @@ static int _dpu_format_populate_plane_sizes_linear( { int i; =20 - memset(layout, 0, sizeof(struct dpu_hw_fmt_layout)); - layout->width =3D fb->width; - layout->height =3D fb->height; - layout->num_planes =3D fmt->num_planes; - /* Due to memset above, only need to set planes of interest */ if (fmt->fetch_type =3D=3D MDP_PLANE_INTERLEAVED) { layout->num_planes =3D 1; @@ -235,9 +221,6 @@ static int _dpu_format_populate_plane_sizes_linear( } } =20 - for (i =3D 0; i < DPU_MAX_PLANES; i++) - layout->total_size +=3D layout->plane_size[i]; - return 0; } =20 @@ -254,6 +237,7 @@ int dpu_format_populate_plane_sizes( struct dpu_hw_fmt_layout *layout) { const struct msm_format *fmt; + int ret, i; =20 if (!layout || !fb) { DRM_ERROR("invalid pointer\n"); @@ -268,10 +252,23 @@ int dpu_format_populate_plane_sizes( =20 fmt =3D msm_framebuffer_format(fb); =20 + memset(layout, 0, sizeof(struct dpu_hw_fmt_layout)); + layout->width =3D fb->width; + layout->height =3D fb->height; + layout->num_planes =3D fmt->num_planes; + if (MSM_FORMAT_IS_UBWC(fmt) || MSM_FORMAT_IS_TILE(fmt)) - return _dpu_format_populate_plane_sizes_ubwc(fmt, fb, layout); + ret =3D _dpu_format_populate_plane_sizes_ubwc(fmt, fb, layout); + else + ret =3D _dpu_format_populate_plane_sizes_linear(fmt, fb, layout); =20 - return _dpu_format_populate_plane_sizes_linear(fmt, fb, layout); + if (ret) + return ret; + + for (i =3D 0; i < DPU_MAX_PLANES; i++) + layout->total_size +=3D layout->plane_size[i]; + + return 0; } =20 static void _dpu_format_populate_addrs_ubwc(struct drm_framebuffer *fb, --=20 2.47.2