From mboxrd@z Thu Jan 1 00:00:00 1970 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 24ED82E2665 for ; Thu, 4 Sep 2025 23:19:22 +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=1757027964; cv=none; b=PtqFkwNtARuMHUSvC8UAlu5sXqtWc/ZOOSw2iUPRL9g3RX37GuiZSugiv1SPeHOjqdHWYYrcpyE2oB5Ton0XzaGR5QxlekpFBngM3VyHX0Qj/xAJdvSxmTRpRVGsT66o9UMJDOX1H7E1k/Cwc/X4qaA9IoKbD47WzWDs/cJJ+yY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757027964; c=relaxed/simple; bh=d+Sq6mF4s98JH1LQ5adEaa0Ic6JeXUlBr4QFvhvY/us=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=XP4XEHo0Mx3kk++udwpXcoaMNUDyQh3MVCerJRWPkXDNtKBec6QQwvx+05BuWJUiRsBBtJ3CwCJmTb18uN8Lf0jXgmx+v1401HAJ44vtAZiTaXItXq7y2daN1Qnd//at2VhxjTj/P/Rzj+oFdthLgzHEYgVzow9Ta8pzrHXjkg0= 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=dJ5x9/nD; 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="dJ5x9/nD" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 584IK1P3023218 for ; Thu, 4 Sep 2025 23:19:22 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= uLamEPOoB01f6VolYXkg33VIoUWF3PW3lIXHLO79ORM=; b=dJ5x9/nDwqG0I6nG swbb8GiZTVtrD56ZTwIxLLIiuVNeDZ8Sc1Y61i0vOAyqhpBwmNMmVZIAfzslWWQr 60uHkHujJSkMDb34pNGdci5ha/9K4O3u4rQPWHM7LX3V3aPoBz1NLT8SxkziKNcf b5kBirlxilwwF7Ti+OCxUHL0SvrvgrqRs8DCHqsapazATKeLFuhX3iRehFaHrXDg DWQ4oKbZt9PJQGC1Ppfzn7osLpOj5LjDZNyWyirm/8SviFNp8cbqFSAGnkgKmLVm WFt768rDvUC67QQU4hbSp2c+XsiwUse5SkUR8IFMK0E/R4XT67f8xZG2CRPqeOfV 3a8Y0w== Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 48uq0esa53-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 04 Sep 2025 23:19:22 +0000 (GMT) Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-329dca88b5aso3258465a91.1 for ; Thu, 04 Sep 2025 16:19:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757027961; x=1757632761; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=uLamEPOoB01f6VolYXkg33VIoUWF3PW3lIXHLO79ORM=; b=bRM/njSVcMWbX07f0qbX7DtXfYFo9rtqxSdqfaA4HqAN5xAXmFhimNSh2Ae65ZFFOm WKMCNNg9ZQYrPP82rFLRIhb00eS6dl6c/nrg92Pc8VUvw1TqWIOCCkeNyNvxLpL1W5vt baQfDK1jLM+qPWLoib1kCXADOcTTshKzlQqNa/VrUjco15TGdMl6kjoNMv9v7Z/+Xg9l j2VjUWcIonbGx7i1OtfT3KLHNOs0UUPyH9gk+xQpUfhBRpFv9HkKH7aB5hTmFsp3EZoj wiMjS4TJRHhWjBVjap7H5dgapysFkLlYeL/JS+y0NfYIcImm9K4HA7VxdOmwWt8iL9Wi xNqg== X-Forwarded-Encrypted: i=1; AJvYcCXuVa6NWV143fQn2mCcAVua166xKL9VJA2yKprCjqmnmPtnzOnsz84UnmUd2yDu7pYkQSob5fKjc/rbX9Q=@vger.kernel.org X-Gm-Message-State: AOJu0YzZEWkdEaNTyFkWJQ4VH3kZDwa9/8vsBwy0sWFV8JX9ybq1YjQB 7N0LTkuuYnSS7ShAwhxcB4Fs6ui+WGscqEPd69+LSBjmDuPeJL2aYgEIavURaa6KuWPyJUmKVOs 54gkjqQVzLq970ubvrj3ZPZH4Ddi1A2BhTBX7fuGLTFmFfFj5QjB3UhaO/OENM0vSBgM= X-Gm-Gg: ASbGncuFXfFAjizOjpq4bJsj0LWOliIooCeN1vYtBn5M3Zz8hKPufm6+s2ivvRAis2d KOTL713LKspaQALAgaUfmC0u96P8PqIZ7gDMR0XflNIEKZssWY1BNQ3445gpcadyhCHDwHJYrPx ldVThlbTsfbhy303lp64PO44P9AbQYNqzCMf8wjwhF0NuKSwAB9vgKOWRktNWM1sO9DTi6QWoOy E/gBRIbZ2NzoU0zyihVPjTgWGyc0qtFUlKVrgnknucKXLRjdFx20tV0MTzChVa6jMTHy2sg+k3m Uzumko0M5VdWp6Qz8NLulfZ6Xwq1r2uSQxB2MqyT3PVGA2K4PtX+VXuShvj+1YLJ44li2muJyCn GJ2jptHv3LoOg0P/6wJtF8w== X-Received: by 2002:a17:90b:1dc1:b0:325:4aa4:fbc5 with SMTP id 98e67ed59e1d1-32bbe21494bmr1348046a91.14.1757027961308; Thu, 04 Sep 2025 16:19:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG14iUJGLqN5Efv5E0YS8iVGtsqzNk5BuOTvAdvDoQ8LeCJbUThTNVtbm48oZSXTCF0CmSDPw== X-Received: by 2002:a17:90b:1dc1:b0:325:4aa4:fbc5 with SMTP id 98e67ed59e1d1-32bbe21494bmr1348016a91.14.1757027960807; Thu, 04 Sep 2025 16:19:20 -0700 (PDT) Received: from [10.134.71.99] (i-global254.qualcomm.com. [199.106.103.254]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3276f57ab9esm26872664a91.4.2025.09.04.16.19.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 04 Sep 2025 16:19:20 -0700 (PDT) Message-ID: <6e8b5af4-c4c3-4354-84ce-5d35475032ac@oss.qualcomm.com> Date: Thu, 4 Sep 2025 16:19:19 -0700 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 09/12] drm/msm/dpu: simplify _dpu_format_populate_plane_sizes_* To: Dmitry Baryshkov , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , 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 References: <20250705-dpu-formats-v1-0-40f0bb31b8c8@oss.qualcomm.com> <20250705-dpu-formats-v1-9-40f0bb31b8c8@oss.qualcomm.com> Content-Language: en-US From: Jessica Zhang In-Reply-To: <20250705-dpu-formats-v1-9-40f0bb31b8c8@oss.qualcomm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Proofpoint-GUID: OPi4MQj0p5AjSl2yGlTofvwpHkOyvvcl X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwODMwMDAwNCBTYWx0ZWRfX3e5Rhmjf2pq9 yQHX9epTIdiDW+xt3kEI8ft+3PkWaycQJeL1JudpKPi4fIcdRexOK01c5qY91t+ofbb6oJBabdn EcNGJGa04tWxdPTuzKl3cfSQqB45xKu6HulBcbYrTxR8mHAJGfs+LS9HIoeCx0tHnzBieinBHHH g9sagF6zq3jZLUOw6/MOuA9ltjIF0Poc/v1wDax04/PZb/yECvz74TximNSr9uZsc3zJuEuBDcN jhevErZgNcJBZuXiWaHgYM2wOMQ5KR2KTce2Bwi/0xmvPAzttkP9uHaqClwI5vj1lqFxW6Evzvc lm7x5VPILgaKBLY/CKUM5UyjoY90lRojQyusDa7yZdzT7AZVEYbOkH9N94hf0IbHvQpg8IqGL+j QBVx04in X-Proofpoint-ORIG-GUID: OPi4MQj0p5AjSl2yGlTofvwpHkOyvvcl X-Authority-Analysis: v=2.4 cv=ea09f6EH c=1 sm=1 tr=0 ts=68ba1e7a cx=c_pps a=0uOsjrqzRL749jD1oC5vDA==:117 a=JYp8KDb2vCoCEuGobkYCKw==:17 a=IkcTkHD0fZMA:10 a=yJojWOMRYYMA:10 a=EUspDBNiAAAA:8 a=4y6PIlbho9MLiPufaWQA:9 a=QEXdDO2ut3YA:10 a=mQ_c8vxmzFEMiUWkPHU9: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 suspectscore=0 clxscore=1015 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 priorityscore=1501 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2507300000 definitions=main-2508300004 On 7/4/2025 7:47 PM, Dmitry Baryshkov wrote: > 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. > > Signed-off-by: Dmitry Baryshkov Reviewed-by: Jessica Zhang > --- > 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 59c9427da7dda07b8e8ee3d070d2dfb3c165698e..195a6b7c4075eef40e7a5d0fee208168421cee35 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 = MSM_FORMAT_IS_UBWC(fmt); > > - memset(layout, 0, sizeof(struct dpu_hw_fmt_layout)); > - layout->width = fb->width; > - layout->height = fb->height; > - layout->num_planes = fmt->num_planes; > - > color = _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); > > if (!meta) > - goto done; > + return 0; > > layout->num_planes += 2; > layout->plane_pitch[2] = 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); > > if (!meta) > - goto done; > + return 0; > + > layout->num_planes += 2; > layout->plane_pitch[2] = VENUS_RGB_META_STRIDE(color, fb->width); > rgb_meta_scanlines = 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); > } > > -done: > - for (i = 0; i < DPU_MAX_PLANES; i++) > - layout->total_size += layout->plane_size[i]; > - > return 0; > } > > @@ -174,11 +165,6 @@ static int _dpu_format_populate_plane_sizes_linear( > { > int i; > > - memset(layout, 0, sizeof(struct dpu_hw_fmt_layout)); > - layout->width = fb->width; > - layout->height = fb->height; > - layout->num_planes = fmt->num_planes; > - > /* Due to memset above, only need to set planes of interest */ > if (fmt->fetch_type == MDP_PLANE_INTERLEAVED) { > layout->num_planes = 1; > @@ -235,9 +221,6 @@ static int _dpu_format_populate_plane_sizes_linear( > } > } > > - for (i = 0; i < DPU_MAX_PLANES; i++) > - layout->total_size += layout->plane_size[i]; > - > return 0; > } > > @@ -254,6 +237,7 @@ int dpu_format_populate_plane_sizes( > struct dpu_hw_fmt_layout *layout) > { > const struct msm_format *fmt; > + int ret, i; > > if (!layout || !fb) { > DRM_ERROR("invalid pointer\n"); > @@ -268,10 +252,23 @@ int dpu_format_populate_plane_sizes( > > fmt = msm_framebuffer_format(fb); > > + memset(layout, 0, sizeof(struct dpu_hw_fmt_layout)); > + layout->width = fb->width; > + layout->height = fb->height; > + layout->num_planes = 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 = _dpu_format_populate_plane_sizes_ubwc(fmt, fb, layout); > + else > + ret = _dpu_format_populate_plane_sizes_linear(fmt, fb, layout); > > - return _dpu_format_populate_plane_sizes_linear(fmt, fb, layout); > + if (ret) > + return ret; > + > + for (i = 0; i < DPU_MAX_PLANES; i++) > + layout->total_size += layout->plane_size[i]; > + > + return 0; > } > > static void _dpu_format_populate_addrs_ubwc(struct msm_gem_address_space *aspace, >