From nobody Mon Feb 9 19:37:46 2026 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (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 3A56113B797 for ; Sat, 23 Nov 2024 05:45:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732340707; cv=none; b=WFnaeLbB+0nCoR8BQCoMuZN4foh+BkXrVWDViQh1gx9+eg1fTxNdti8gMxquu4/OtPAWLoBtKXHWvB/Anbfurssl+21ehUSiY7gP0iWtoCaQNHIUGkpFSMwI8/EjrMVUmx+hlcE0wyfMXZXwW7XOenKo2iedLTsfhmerAg8zAAg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732340707; c=relaxed/simple; bh=Y68Ugbn4mNiWYoL63ZWT5oQDamfsA6evrZEL1K8NhkE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fg/uQ9/hs19Dw8URbWxZhncsRJGPV91kppJ5IKKJ3/NkmmPv4FdqMpxxbJFh/UTnJ6UsLy03ojFPJstlkIU1RiJPUgQ1ZfrPPWggO3Z6W9mpJ+U9/hzvaCIYL+lIEMdxmHWy2a8psNN0GosGEeSOLZ18jClI5QeyW4r3olnVszE= 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=isDWXYJL; arc=none smtp.client-ip=209.85.167.45 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="isDWXYJL" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-53da22c5863so3438690e87.0 for ; Fri, 22 Nov 2024 21:45:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732340703; x=1732945503; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=F/nCfdT94fyFdmLpDtTnLp3HU3nkqA/lIsXWnP4b+r8=; b=isDWXYJLOa3+QX6cOXy4OQtnvhgS3T2USvY/YXL9mKY/MzfCl95qpo3+vqd8M/nR0t NLgXimGyuXUSXS8x4qrDGj+ugKWiRc5SFT+nen7JTzfsaOWa5qIsaunlQ1JKTu/paEKh a08E2G35oGC5J+Zo7g51q3uCl5+JRZGJdrEoMWyhj4jhpzQSz/TyvgHImiXXwiAR/Aj1 gU4tQLo0hse/dZO3I1hYHgmoI76jTtKq4dbVa8lgdFM/x/dqqI2WwUhtu/nLcnLxdcuk 5dkd0s7swpJtfvLAws86FFG2UQX6Gy7AChHhYUzb5r3nWbxsuFc6J1Dvkb0mYZgKjj6x kWxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732340703; x=1732945503; 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=F/nCfdT94fyFdmLpDtTnLp3HU3nkqA/lIsXWnP4b+r8=; b=DTpXSsYOW7G2tkAJEcdNYVECioWu5XIhS9X/OY8DpZ0QVypjZ0dpPH5WpjVZD5vvpG m4X0toya99H9NjI8nri2Z1Q0VAARp7MrEsxyS6IX6DYk6MwrUV3M6/K27TspF65Le87Y XIB8GW+S+FaRSO5E4dCIBL1gb/qppqnwH1k/KgYsNIvCNh8iq3C3P7CQYQsI1BqL/kT8 Uj9qpLOvi9JeL3v3scOb23wVl68lcg1c5tNyxZWkyOaEWtNBVA5V6Hn59HYv0v0WByAH mzyUiVvLda4UN9vWVOWFM/gZul+oK572ZKmZIAL+ZixEGCwVPcHwLKB/8M5tD/fIgDFs McgQ== X-Gm-Message-State: AOJu0YwqIbAB6Fp82VLhhXUhMkGzNLv0Yda8wQTtvHPtqjDmCilM93yf 9q65BLd0JZ9/gPLYcn9/E7CSzrwF2VBc8+tVc7Xdb2uqSICAyYMgns15h4/EY3Q= X-Gm-Gg: ASbGncuoZDdHDqxZftiRT1PARHY3QuhPnyuH5ZRea+U90zrtHwNk0kOeFvr0ObE4fT6 /zPIkw3SR81vEeACHTruFlQ1/458PO3Gvl/GEeQzVM6VwJ5wI6+gj2wosGrk7tO/PthVKvAmCz0 TQBKR1bXvIiWGh4mCikj582W+3uBXxUflCa8Y/+9PS5w+gehEtGySDmUiJK8Ba/HOrrnzN16yYJ 4LwnXJog6KaK8gEu7ioReT7+Bbs1u1huGs5swBZtdlfMV8BsaPXLL9D4w== X-Google-Smtp-Source: AGHT+IFY49Rgn1MaIQDHpFNZUMu1vu8VWeMQfbuzyBAcqr3XvF3KCIyE4wfVVxUlCuwrgJywOYILLg== X-Received: by 2002:ac2:4f11:0:b0:539:e1c6:9d7f with SMTP id 2adb3069b0e04-53dd389d698mr2913067e87.25.1732340703363; Fri, 22 Nov 2024 21:45:03 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-53dd24457e1sm740143e87.34.2024.11.22.21.45.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Nov 2024 21:45:02 -0800 (PST) From: Dmitry Baryshkov Date: Sat, 23 Nov 2024 07:44:54 +0200 Subject: [PATCH v2 1/3] drm/msm/mdss: define bitfields for the UBWC_STATIC register 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: <20241123-msm-mdss-ubwc-v2-1-41344bc6ef9c@linaro.org> References: <20241123-msm-mdss-ubwc-v2-0-41344bc6ef9c@linaro.org> In-Reply-To: <20241123-msm-mdss-ubwc-v2-0-41344bc6ef9c@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , Connor Abbott , David Airlie , Simona Vetter Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5924; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=Y68Ugbn4mNiWYoL63ZWT5oQDamfsA6evrZEL1K8NhkE=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnQWvax+ERF5jWnoJ2D5csc83mmx3JD2vw5Eoms uXY7FLT8QWJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ0Fr2gAKCRCLPIo+Aiko 1UZBB/45xpSd2K4g1tGqC0fO7jL9S+4VJS9xjljQccCOrTeJuqqpnlre/xgbYxLWh0uVQwgR5KC 2sTB8byJ384FGqyK4mwOxKEa3UP7jsQUYECX73tQrVyPPQS7Yj3s+dkJND+bU/h8/2REK+3+PFr DoJbdGpQ9jvHySdJW6oF5FF64pOx6kP2eiC2y+2k1iRHFkdHyTGVT1vlix/Wi2Hp6l34JPpfrq3 JXxOnreX/vtQYG053n+RPGI+anQ/Sf0llf0CsIMaYTVgjuhgcCBvp9SXdLbV2bOZ5NFxFEw+u5L SVj7ibE6LGutfSSRWWyv2lKtRr5Zn3++rKnpfCYb/gvtyexG X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Rather than hand-coding UBWC_STATIC value calculation, define corresponding bitfields and use them to setup the register value. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/msm_mdss.c | 38 +++++++++++++++-------= ---- drivers/gpu/drm/msm/msm_mdss.h | 3 +- drivers/gpu/drm/msm/registers/display/mdss.xml | 11 +++++++- 3 files changed, 34 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c index b7bd899ead44bf86998e7295bccb31a334fa6811..4b57f39bec4e6232a0f5b4d49f8= ae1200e74ac78 100644 --- a/drivers/gpu/drm/msm/msm_mdss.c +++ b/drivers/gpu/drm/msm/msm_mdss.c @@ -173,15 +173,17 @@ static void msm_mdss_setup_ubwc_dec_20(struct msm_mds= s *msm_mdss) static void msm_mdss_setup_ubwc_dec_30(struct msm_mdss *msm_mdss) { const struct msm_mdss_data *data =3D msm_mdss->mdss_data; - u32 value =3D (data->ubwc_swizzle & 0x1) | - (data->highest_bank_bit & 0x3) << 4 | - (data->macrotile_mode & 0x1) << 12; + u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle & 0x1) | + MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit); + + if (data->macrotile_mode) + value |=3D MDSS_UBWC_STATIC_MACROTILE_MODE; =20 if (data->ubwc_enc_version =3D=3D UBWC_3_0) - value |=3D BIT(10); + value |=3D MDSS_UBWC_STATIC_UBWC_AMSBC; =20 if (data->ubwc_enc_version =3D=3D UBWC_1_0) - value |=3D BIT(8); + value |=3D MDSS_UBWC_STATIC_UBWC_MIN_ACC_LEN; =20 writel_relaxed(value, msm_mdss->mmio + REG_MDSS_UBWC_STATIC); } @@ -189,10 +191,14 @@ static void msm_mdss_setup_ubwc_dec_30(struct msm_mds= s *msm_mdss) static void msm_mdss_setup_ubwc_dec_40(struct msm_mdss *msm_mdss) { const struct msm_mdss_data *data =3D msm_mdss->mdss_data; - u32 value =3D (data->ubwc_swizzle & 0x7) | - (data->ubwc_static & 0x1) << 3 | - (data->highest_bank_bit & 0x7) << 4 | - (data->macrotile_mode & 0x1) << 12; + u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle) | + MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit); + + if (data->ubwc_bank_spread) + value |=3D MDSS_UBWC_STATIC_UBWC_BANK_SPREAD; + + if (data->macrotile_mode) + value |=3D MDSS_UBWC_STATIC_MACROTILE_MODE; =20 writel_relaxed(value, msm_mdss->mmio + REG_MDSS_UBWC_STATIC); =20 @@ -572,7 +578,7 @@ static const struct msm_mdss_data sa8775p_data =3D { .ubwc_enc_version =3D UBWC_4_0, .ubwc_dec_version =3D UBWC_4_0, .ubwc_swizzle =3D 4, - .ubwc_static =3D 1, + .ubwc_bank_spread =3D true, .highest_bank_bit =3D 0, .macrotile_mode =3D 1, .reg_bus_bw =3D 74000, @@ -590,7 +596,7 @@ static const struct msm_mdss_data sc7280_data =3D { .ubwc_enc_version =3D UBWC_3_0, .ubwc_dec_version =3D UBWC_4_0, .ubwc_swizzle =3D 6, - .ubwc_static =3D 1, + .ubwc_bank_spread =3D true, .highest_bank_bit =3D 1, .macrotile_mode =3D 1, .reg_bus_bw =3D 74000, @@ -608,7 +614,7 @@ static const struct msm_mdss_data sc8280xp_data =3D { .ubwc_enc_version =3D UBWC_4_0, .ubwc_dec_version =3D UBWC_4_0, .ubwc_swizzle =3D 6, - .ubwc_static =3D 1, + .ubwc_bank_spread =3D true, .highest_bank_bit =3D 3, .macrotile_mode =3D 1, .reg_bus_bw =3D 76800, @@ -671,7 +677,7 @@ static const struct msm_mdss_data sm8250_data =3D { .ubwc_enc_version =3D UBWC_4_0, .ubwc_dec_version =3D UBWC_4_0, .ubwc_swizzle =3D 6, - .ubwc_static =3D 1, + .ubwc_bank_spread =3D true, /* TODO: highest_bank_bit =3D 2 for LP_DDR4 */ .highest_bank_bit =3D 3, .macrotile_mode =3D 1, @@ -682,7 +688,7 @@ static const struct msm_mdss_data sm8350_data =3D { .ubwc_enc_version =3D UBWC_4_0, .ubwc_dec_version =3D UBWC_4_0, .ubwc_swizzle =3D 6, - .ubwc_static =3D 1, + .ubwc_bank_spread =3D true, /* TODO: highest_bank_bit =3D 2 for LP_DDR4 */ .highest_bank_bit =3D 3, .macrotile_mode =3D 1, @@ -693,7 +699,7 @@ static const struct msm_mdss_data sm8550_data =3D { .ubwc_enc_version =3D UBWC_4_0, .ubwc_dec_version =3D UBWC_4_3, .ubwc_swizzle =3D 6, - .ubwc_static =3D 1, + .ubwc_bank_spread =3D true, /* TODO: highest_bank_bit =3D 2 for LP_DDR4 */ .highest_bank_bit =3D 3, .macrotile_mode =3D 1, @@ -704,7 +710,7 @@ static const struct msm_mdss_data x1e80100_data =3D { .ubwc_enc_version =3D UBWC_4_0, .ubwc_dec_version =3D UBWC_4_3, .ubwc_swizzle =3D 6, - .ubwc_static =3D 1, + .ubwc_bank_spread =3D true, /* TODO: highest_bank_bit =3D 2 for LP_DDR4 */ .highest_bank_bit =3D 3, .macrotile_mode =3D 1, diff --git a/drivers/gpu/drm/msm/msm_mdss.h b/drivers/gpu/drm/msm/msm_mdss.h index 3afef4b1786d28902799333ff66c8b3ad0ab77fa..715e1426093de5a4f3b7d2b66b8= 89573c30b7b5c 100644 --- a/drivers/gpu/drm/msm/msm_mdss.h +++ b/drivers/gpu/drm/msm/msm_mdss.h @@ -13,7 +13,8 @@ struct msm_mdss_data { u32 ubwc_swizzle; u32 ubwc_static; u32 highest_bank_bit; - u32 macrotile_mode; + bool ubwc_bank_spread; + bool macrotile_mode; u32 reg_bus_bw; }; =20 diff --git a/drivers/gpu/drm/msm/registers/display/mdss.xml b/drivers/gpu/d= rm/msm/registers/display/mdss.xml index ac85caf1575c7908bcf68f0249da38dccf4f07b6..b6f93984928522a35a782cbad9d= e006eac225725 100644 --- a/drivers/gpu/drm/msm/registers/display/mdss.xml +++ b/drivers/gpu/drm/msm/registers/display/mdss.xml @@ -21,7 +21,16 @@ xsi:schemaLocation=3D"https://gitlab.freedesktop.org/fre= edreno/ rules-fd.xsd"> =20 =20 - + + + + + + + + + + --=20 2.39.5