From nobody Mon Jun 15 23:21:54 2026 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0D9BD33F8D9 for ; Tue, 14 Apr 2026 15:14:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776179676; cv=none; b=H8L/gilWaLes7Bb2pIugOsoyLB/igTE5p9dzqxsVBmy6rkZdFClckPOf+/uq/TUaNcgPCl5G8+ohpd4aOXId3xrt8qOneqnBkSLrW7ObZvfnNktRwBkfjk6tlORW8gjw3mN0PshCVD7YocYkNsPQGvAVRKAXUqeL/4laUqkgaEQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776179676; c=relaxed/simple; bh=daNW5uhl4d69yIZFZewRQFFqst7fvn+JOIJGQIVovjQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=Y4K0crgNG1h60tZKs1Ad6+L0P5grjYgFI2+qDhVFTk4ftc3cT3yKUvDf5S4Evv7AxbAPQLWhboWiZeOch+Oy8Kx109MZtUcnKRx+qkBe9CI/YZY07CKZzJCuAc6+C904DXZQIIhqJLx+dH78TSSsAO01y/fOxx8DAJqz9cXJJ7k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=GtAYT0m0; arc=none smtp.client-ip=209.85.221.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="GtAYT0m0" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-43d734223e4so1669389f8f.0 for ; Tue, 14 Apr 2026 08:14:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776179673; x=1776784473; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=TOwZpBzYvLqLifJr7F7A9849bw8ux30LzyeD+wX4bPE=; b=GtAYT0m0cS0xh2do8xawSDGnFdYRU2vb/fdDroi4NwvbHYaWVCa4LW1zNw5fOqQ5vg A20KXvElXQ63ipaFNapE+Op3K6Gz/3DEmn9rInkHIJbzCYZHt+3b9O2D336QHcc7DR7e slWyoi+lAlVv1w2QgstrWAror5oePjYPxAxNnjclgt1bkMnwAmhy7FI6hRpu3wupbeeq bkSJsU+bxwRuPWONfupF36qhbDxnJyYngmA7tYShXObufCiEK14Neb1RY+PebN1NnqFC zxq8LKz1vD1VRj5B/KTZ2T968ClY7yfxqsFG6EUdoJCa2GJlU/9+0EZKxRnZCcQGVmdc iQTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776179673; x=1776784473; h=cc:to: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=TOwZpBzYvLqLifJr7F7A9849bw8ux30LzyeD+wX4bPE=; b=PJNSCssGztL6AkQcTIsUAXL+r/dGRmIBb2gFA9fKhLfaNQOe1Cnn6qpg9p08caJWpl 3tnhzSf1q7kMRXl1j9/BlZioXPsgUudkXz2UkumvHIUK83utsuMaA9ablwi+bOeGEWia YrnbGt6fQ0hVPAc/0dvlwcZO3Zt/C2N3wMYD9cF01W0t5gbwO57+hSX/TbetPlCJnJO3 GfrpACy5FDApsH9Le+OmNkyKdxZ1bDMPePURt0qPcon1ZSxw3l5UZLb0fyHTUosvKTzF 2LO13VZ2LVqYnCk7d3DntWYwWyflKqhDWOayt6iNVeBuCz6cUh+LqsN7TU5HxrJS2CyE uEng== X-Forwarded-Encrypted: i=1; AFNElJ9Zd2etISqM5M2oHdso/4AwlDV1Wmj8nA9X50VoLjgr6V5LdBLm3YPUYcqtRhGKmiZxWhiOpuQPs/oWGiQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwIs4dgGY6HxCVMmypCjWhtGajAXDUKeWegSqq0az1bxisLR5LP gOo6AtfvedhLNVlBKhM4kNS7mYaBeiPDPPLjPLf0JLIXnVqwau927tB9QrSqFxuHJ0U= X-Gm-Gg: AeBDievXRD/uMUC301bJa7wrsSfyU2XVv8MWHLi6t9H3dL32YkCSoDT7rKVanTN8a7Z 21dnTRlIuTtAJG1mi1GI+Bzm3MbGRHOlJ+vvFptUiqWbJx6qFdanLwoAbQXdyHL8dzE4zUP1Zst q/L2VhYPfBLrlzWgxa7TmFV9X1YaFI2dQYH9Vemzwfm3ACklCVaHXuzo7rFgqCmVV9/0yuuyXEG 0W9nUHb9+JOYT+G9y9G897i5rvptJ5DXZ/Nc62PnRWMw1VGc9c7T4KsGFgejs/KqYwTRekJ+OdD dpFwntygf3ieQgrlA5KLzBbszieUf8KmH1POkUO6uNniVwL1q8xFsFsIF/NtNqP08HU2cST2r4M vyFHjRSplsyFHWuImR8FDWKz6IxSj/jPLtkIpcNKsAqcX4afzrr4nRdeQousoLXl0MzClk/0Ufy +2jShzLrhNrjw0hJ01ZeWtG+BaOkdP5JZ6V4bzREL96B4AOlC369gxvVw= X-Received: by 2002:a05:6000:2b09:b0:439:adc3:f0e7 with SMTP id ffacd0b85a97d-43d595734admr20994466f8f.9.1776179673287; Tue, 14 Apr 2026 08:14:33 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:106d:1080:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43d6f4bf2b4sm25956011f8f.20.2026.04.14.08.14.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Apr 2026 08:14:32 -0700 (PDT) From: Neil Armstrong Date: Tue, 14 Apr 2026 17:14:30 +0200 Subject: [PATCH] drm/msm/dpu: fix UV scanlines calculation for YUV UBWC formats 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: <20260414-topic-sm8x50-msm-dpu1-formats-qc10c-v1-1-0b62325b9030@linaro.org> X-B4-Tracking: v=1; b=H4sIANVZ3mkC/yXNQQ6CMBBA0auQWTtJB0HAqxgXpR20JqWlUwwJ4 e5WXb7N/zsIJ8cC12qHxG8nLswFdKrAPPX8YHS2GGpVX1RDDeYQnUHx/dYq9OLRxpVwCsnrLLg YUga7fjwPNOiOWgulFBNPbvtdbve/ZR1fbPI3DcfxASTMqpeHAAAA X-Change-ID: 20260414-topic-sm8x50-msm-dpu1-formats-qc10c-78b3919a715d To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: Dmitry Baryshkov , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.15.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=2274; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=daNW5uhl4d69yIZFZewRQFFqst7fvn+JOIJGQIVovjQ=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBp3lnXjyuO16e83pIqkj/ZpFIanlemWzuLSHOdgp0m eYSOaNyJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCad5Z1wAKCRB33NvayMhJ0VRWD/ 42Ak2UHmBvvxPgf3HbVUpdXbs402uEX9kpFKXcY6YabdjNXKa2NLiSJ2zw3IyM3PN1jBfaJ6QgiDRY SzW13IVEVvaiIcroZvqG7dLF/k42Lc9uMbdDOHv4Cgw76Pj6q5oyma9kGa2bUmhobknqEMdnBeTBLU S3fwoTrXnBEYaNPUI2Uu2McTnn0fttzhQwyg012v/fdqY2Xwed5WBzWIQuCMx/WwZnD7+knGiyBpg8 P8NWukq3FwqTdxXe39jFCYAq0fv6M5Qjdubnr7oeQSl3B3WNEl9fejybPrfCFkhWrwUlcHXwbzzm6k ECh94yq+U2i4B1qm+Sc/+/j46zGT6uyWc/iG8acUzNdpUqN0j8yZCu2YE5ZV3NN0uvXuR6TkdfWqmo qzrMVRZEVWP+mfWhfIH1dGz389IDXO0v6vfOF4xrOtMxMQpodtZJhKiw3T38jZePBL1U7fVR8LwPuW 1uuQ02EMLNErtQOKbOVUqtsRAjUn385xlYLEZlGwyTG3lOjTg+ABmXhqLqT7+TwoW66/R8onwmpn/X WYBc9ZBjtq2ZmhfrOz60V9gVDQDhisOSe4qtVT8JEP4eglJHDNg35j2TJvILIwniHtgzssFV7j6pAh XWc3gjKguvh/LUaQyP9s0TvhTdnESILpRc+UyKjOSZQm+JqdwSJMfWfDfyHg== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE The UV scanlines is calculated with (height + 1) / 2 unlike the Y scanlines, add back the correct scanlines calculation for UBWC YUV formats. Fixes: 2f3ff6ab8f5c ("drm/msm/dpu: use standard functions in _dpu_format_po= pulate_plane_sizes_ubwc()") Fixes: ada4a19ed21c ("drm/msm/dpu: rewrite _dpu_format_populate_plane_sizes= _ubwc()") Signed-off-by: Neil Armstrong Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c b/drivers/gpu/drm/= msm/disp/dpu1/dpu_formats.c index 6e8883dbfad4..590922c4f69b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c @@ -61,7 +61,7 @@ static int _dpu_format_populate_plane_sizes_ubwc( bool meta =3D MSM_FORMAT_IS_UBWC(fmt); =20 if (MSM_FORMAT_IS_YUV(fmt)) { - unsigned int stride, sclines; + unsigned int stride, y_sclines, uv_sclines; unsigned int y_tile_width, y_tile_height; unsigned int y_meta_stride, y_meta_scanlines; unsigned int uv_meta_stride, uv_meta_scanlines; @@ -77,23 +77,25 @@ static int _dpu_format_populate_plane_sizes_ubwc( y_tile_width =3D 32; } =20 - sclines =3D round_up(fb->height, 16); + y_sclines =3D round_up(fb->height, 16); + uv_sclines =3D round_up((fb->height+1)>>1, 16); y_tile_height =3D 4; } else { stride =3D round_up(fb->width, 128); y_tile_width =3D 32; =20 - sclines =3D round_up(fb->height, 32); + y_sclines =3D round_up(fb->height, 32); + uv_sclines =3D round_up((fb->height+1)>>1, 32); y_tile_height =3D 8; } =20 layout->plane_pitch[0] =3D stride; layout->plane_size[0] =3D round_up(layout->plane_pitch[0] * - sclines, DPU_UBWC_PLANE_SIZE_ALIGNMENT); + y_sclines, DPU_UBWC_PLANE_SIZE_ALIGNMENT); =20 layout->plane_pitch[1] =3D stride; layout->plane_size[1] =3D round_up(layout->plane_pitch[1] * - sclines, DPU_UBWC_PLANE_SIZE_ALIGNMENT); + uv_sclines, DPU_UBWC_PLANE_SIZE_ALIGNMENT); =20 if (!meta) return 0; --- base-commit: 66672af7a095d89f082c5327f3b15bc2f93d558e change-id: 20260414-topic-sm8x50-msm-dpu1-formats-qc10c-78b3919a715d Best regards, -- =20 Neil Armstrong