From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 51A7CFC72D4 for ; Sun, 22 Mar 2026 18:48:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4250110E18C; Sun, 22 Mar 2026 18:48:21 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; secure) header.d=pm.me header.i=@pm.me header.b="emA7uTEb"; dkim-atps=neutral Received: from mail-106118.protonmail.ch (mail-106118.protonmail.ch [79.135.106.118]) by gabe.freedesktop.org (Postfix) with ESMTPS id 50D2510E18C for ; Sun, 22 Mar 2026 18:48:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1774205296; x=1774464496; bh=W2vGcjC6o/9rSwUMT8OLICaUBrAZ7/2I6vU0gYR4kkI=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=emA7uTEbUSB1oLP8p8Qfqf3JY4Ah2oLbQEHzVwPVwpsJiypdw9g9gxhVLWtIwV7t/ 6jWcwvikiTzA0HwQMpK8laie4hIDdn0yjZKUzRBXRgwjPCb2XUK1d/AriteyNhZ5kK DHWpG/wvWPpY951Wee/DLhxlIO307BpjjvtvHd93n3/stWlHd1d8b4LrdMGd0c6P5d UpRbOEVb3rBXCezInh5WXfImlckCPEYkT8XTZe+mlEX9AhkgrZopqeXN6GwoohF8U4 evuntgGhVq7wSf+Gm4GkaNVdcIrBkJaIrwTC+jpNi1Og2GtAlpJ5QZ4CfwXvzoWxZF zZvCoqxC+x49g== Date: Sun, 22 Mar 2026 18:48:09 +0000 To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter From: Alexander Koskovich Cc: Jonathan Marek , Neil Armstrong , Pengyu Luo , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Alexander Koskovich Subject: [PATCH v2] drm/msm/dpu: calculate data_width like downstream Message-ID: <20260322-fix-data-width-calc-v2-1-d5f28136bc4e@pm.me> Feedback-ID: 37836894:user:proton X-Pm-Message-ID: 42764064717d064bdc2b817f89f4066be9490a98 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Derive INTF data_width from dce_bytes_per_line rather than timing->width when DSC is enabled. Use DIV_ROUND_UP to avoid rounding errors. Signed-off-by: Alexander Koskovich --- Changes in v2: - Added back comment about DSC & DP - Link to v1: https://lore.kernel.org/r/20260322-fix-data-width-calc-v1-1-1= 28880f5a067@pm.me --- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 2 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 26 +++++++++++++++++-= ---- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 1 + 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c b/drivers= /gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c index 0ba777bda253..ba810f26ea30 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c @@ -10,6 +10,7 @@ #include "dpu_formats.h" #include "dpu_trace.h" #include "disp/msm_disp_snapshot.h" +#include "msm_dsc_helper.h" =20 #include #include @@ -136,6 +137,7 @@ static void drm_mode_to_intf_timing_params( =09=09timing->width =3D timing->width * drm_dsc_get_bpp_int(dsc) / =09=09=09=09(dsc->bits_per_component * 3); =09=09timing->xres =3D timing->width; +=09=09timing->dce_bytes_per_line =3D msm_dsc_get_bytes_per_line(dsc); =09} } =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c b/drivers/gpu/drm/= msm/disp/dpu1/dpu_hw_intf.c index 7e620f590984..ac82b69aedf6 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c @@ -173,13 +173,29 @@ static void dpu_hw_intf_setup_timing_engine(struct dp= u_hw_intf *intf, =09data_width =3D p->width; =20 =09/* -=09 * If widebus is enabled, data is valid for only half the active window -=09 * since the data rate is doubled in this mode. But for the compression -=09 * mode in DP case, the p->width is already adjusted in -=09 * drm_mode_to_intf_timing_params() +=09 * If widebus is disabled: +=09 * For uncompressed stream, the data is valid for the entire active +=09 * window period. +=09 * For compressed stream, data is valid for a shorter time period +=09 * inside the active window depending on the compression ratio. +=09 * +=09 * If widebus is enabled: +=09 * For uncompressed stream, data is valid for only half the active +=09 * window, since the data rate is doubled in this mode. +=09 * For compressed stream, data validity window needs to be adjusted for +=09 * compression ratio and then further halved. +=09 * +=09 * For the compression mode in DP case, the p->width is already +=09 * adjusted in drm_mode_to_intf_timing_params(). =09 */ -=09if (p->wide_bus_en && !dp_intf) +=09if (p->compression_en && !dp_intf) { +=09=09if (p->wide_bus_en) +=09=09=09data_width =3D DIV_ROUND_UP(p->dce_bytes_per_line, 6); +=09=09else +=09=09=09data_width =3D DIV_ROUND_UP(p->dce_bytes_per_line, 3); +=09} else if (p->wide_bus_en && !dp_intf) { =09=09data_width =3D p->width >> 1; +=09} =20 =09/* TODO: handle DSC+DP case, we only handle DSC+DSI case so far */ =09if (p->compression_en && !dp_intf && diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h b/drivers/gpu/drm/= msm/disp/dpu1/dpu_hw_intf.h index f6ef2c21b66d..badd26305fc9 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h @@ -35,6 +35,7 @@ struct dpu_hw_intf_timing_params { =20 =09bool wide_bus_en; =09bool compression_en; +=09u32 dce_bytes_per_line; }; =20 struct dpu_hw_intf_prog_fetch { --- base-commit: f338e77383789c0cae23ca3d48adcc5e9e137e3c change-id: 20260322-fix-data-width-calc-c44287df08b8 Best regards, --=20 Alexander Koskovich