Code in dpu_hw_sspp_setup_format() doesn't handle UBWC versions bigger
than 4.0. Replace switch-case with if-else checks, making sure that the
register is initialized on UBWC 5.x (and later) hosts.
Fixes: c2577fc1740d ("drm/msm/dpu: Add support for SM8750")
Tested-by: Val Packett <val@packett.cool> # x1e80100-dell-latitude-7455
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 45 +++++++++++++++--------------
1 file changed, 24 insertions(+), 21 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
index 6ff4902fce08..f275b14da4ff 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
@@ -284,6 +284,7 @@ static void dpu_hw_sspp_setup_format(struct dpu_sw_pipe *pipe,
if (fmt->fetch_mode != MDP_FETCH_LINEAR) {
u32 hbb = ctx->ubwc->highest_bank_bit - 13;
+ u32 ctrl_val;
if (MSM_FORMAT_IS_UBWC(fmt))
opmode |= MDSS_MDP_OP_BWC_EN;
@@ -291,30 +292,32 @@ static void dpu_hw_sspp_setup_format(struct dpu_sw_pipe *pipe,
DPU_REG_WRITE(c, SSPP_FETCH_CONFIG,
DPU_FETCH_CONFIG_RESET_VALUE |
hbb << 18);
- switch (ctx->ubwc->ubwc_enc_version) {
- case UBWC_1_0:
+
+ if (ctx->ubwc->ubwc_enc_version == UBWC_1_0) {
fast_clear = fmt->alpha_enable ? BIT(31) : 0;
- DPU_REG_WRITE(c, ubwc_ctrl_off,
- fast_clear | (ctx->ubwc->ubwc_swizzle & 0x1) |
- BIT(8) |
- (hbb << 4));
- break;
- case UBWC_2_0:
+ ctrl_val = fast_clear | (ctx->ubwc->ubwc_swizzle & 0x1) |
+ BIT(8) | (hbb << 4);
+ } else if (ctx->ubwc->ubwc_enc_version == UBWC_2_0) {
fast_clear = fmt->alpha_enable ? BIT(31) : 0;
- DPU_REG_WRITE(c, ubwc_ctrl_off,
- fast_clear | (ctx->ubwc->ubwc_swizzle) |
- (hbb << 4));
- break;
- case UBWC_3_0:
- DPU_REG_WRITE(c, ubwc_ctrl_off,
- BIT(30) | (ctx->ubwc->ubwc_swizzle) |
- (hbb << 4));
- break;
- case UBWC_4_0:
- DPU_REG_WRITE(c, ubwc_ctrl_off,
- MSM_FORMAT_IS_YUV(fmt) ? 0 : BIT(30));
- break;
+ ctrl_val = fast_clear | ctx->ubwc->ubwc_swizzle | (hbb << 4);
+ } else if (ctx->ubwc->ubwc_enc_version == UBWC_3_0) {
+ ctrl_val = BIT(30) | (ctx->ubwc->ubwc_swizzle) | (hbb << 4);
+ } else if (ctx->ubwc->ubwc_enc_version == UBWC_4_0) {
+ ctrl_val = MSM_FORMAT_IS_YUV(fmt) ? 0 : BIT(30);
+ } else if (ctx->ubwc->ubwc_enc_version <= UBWC_6_0) {
+ if (MSM_FORMAT_IS_YUV(fmt))
+ ctrl_val = 0;
+ else if (MSM_FORMAT_IS_DX(fmt)) /* or FP16, but it's unsupported */
+ ctrl_val = BIT(30);
+ else
+ ctrl_val = BIT(30) | BIT(31);
+ /* SDE also sets bits for lossy formats, but we don't support them yet */
+ } else {
+ DRM_WARN_ONCE("Unsupported UBWC version %x\n", ctx->ubwc->ubwc_enc_version);
+ ctrl_val = 0;
}
+
+ DPU_REG_WRITE(c, ubwc_ctrl_off, ctrl_val);
}
opmode |= MDSS_MDP_OP_PE_OVERRIDE;
--
2.47.3
On 1/19/26 1:16 PM, Dmitry Baryshkov wrote:
> Code in dpu_hw_sspp_setup_format() doesn't handle UBWC versions bigger
> than 4.0. Replace switch-case with if-else checks, making sure that the
> register is initialized on UBWC 5.x (and later) hosts.
>
> Fixes: c2577fc1740d ("drm/msm/dpu: Add support for SM8750")
> Tested-by: Val Packett <val@packett.cool> # x1e80100-dell-latitude-7455
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> ---
[...]
> + if (ctx->ubwc->ubwc_enc_version == UBWC_1_0) {
> fast_clear = fmt->alpha_enable ? BIT(31) : 0;
> - DPU_REG_WRITE(c, ubwc_ctrl_off,
> - fast_clear | (ctx->ubwc->ubwc_swizzle & 0x1) |
> - BIT(8) |
> - (hbb << 4));
> - break;
> - case UBWC_2_0:
> + ctrl_val = fast_clear | (ctx->ubwc->ubwc_swizzle & 0x1) |
> + BIT(8) | (hbb << 4);
> + } else if (ctx->ubwc->ubwc_enc_version == UBWC_2_0) {
> fast_clear = fmt->alpha_enable ? BIT(31) : 0;
> - DPU_REG_WRITE(c, ubwc_ctrl_off,
> - fast_clear | (ctx->ubwc->ubwc_swizzle) |
> - (hbb << 4));
> - break;
> - case UBWC_3_0:
> - DPU_REG_WRITE(c, ubwc_ctrl_off,
> - BIT(30) | (ctx->ubwc->ubwc_swizzle) |
> - (hbb << 4));
> - break;
> - case UBWC_4_0:
> - DPU_REG_WRITE(c, ubwc_ctrl_off,
> - MSM_FORMAT_IS_YUV(fmt) ? 0 : BIT(30));
> - break;
> + ctrl_val = fast_clear | ctx->ubwc->ubwc_swizzle | (hbb << 4);
> + } else if (ctx->ubwc->ubwc_enc_version == UBWC_3_0) {
> + ctrl_val = BIT(30) | (ctx->ubwc->ubwc_swizzle) | (hbb << 4);
This is pre-existing, but BIT(30) is not unconditional in SDE for v3
For this patch
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Konrad
On Mon, Jan 19, 2026 at 01:24:58PM +0100, Konrad Dybcio wrote:
> On 1/19/26 1:16 PM, Dmitry Baryshkov wrote:
> > Code in dpu_hw_sspp_setup_format() doesn't handle UBWC versions bigger
> > than 4.0. Replace switch-case with if-else checks, making sure that the
> > register is initialized on UBWC 5.x (and later) hosts.
> >
> > Fixes: c2577fc1740d ("drm/msm/dpu: Add support for SM8750")
> > Tested-by: Val Packett <val@packett.cool> # x1e80100-dell-latitude-7455
> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> > ---
>
> [...]
>
> > + if (ctx->ubwc->ubwc_enc_version == UBWC_1_0) {
> > fast_clear = fmt->alpha_enable ? BIT(31) : 0;
> > - DPU_REG_WRITE(c, ubwc_ctrl_off,
> > - fast_clear | (ctx->ubwc->ubwc_swizzle & 0x1) |
> > - BIT(8) |
> > - (hbb << 4));
> > - break;
> > - case UBWC_2_0:
> > + ctrl_val = fast_clear | (ctx->ubwc->ubwc_swizzle & 0x1) |
> > + BIT(8) | (hbb << 4);
> > + } else if (ctx->ubwc->ubwc_enc_version == UBWC_2_0) {
> > fast_clear = fmt->alpha_enable ? BIT(31) : 0;
> > - DPU_REG_WRITE(c, ubwc_ctrl_off,
> > - fast_clear | (ctx->ubwc->ubwc_swizzle) |
> > - (hbb << 4));
> > - break;
> > - case UBWC_3_0:
> > - DPU_REG_WRITE(c, ubwc_ctrl_off,
> > - BIT(30) | (ctx->ubwc->ubwc_swizzle) |
> > - (hbb << 4));
> > - break;
> > - case UBWC_4_0:
> > - DPU_REG_WRITE(c, ubwc_ctrl_off,
> > - MSM_FORMAT_IS_YUV(fmt) ? 0 : BIT(30));
> > - break;
> > + ctrl_val = fast_clear | ctx->ubwc->ubwc_swizzle | (hbb << 4);
> > + } else if (ctx->ubwc->ubwc_enc_version == UBWC_3_0) {
> > + ctrl_val = BIT(30) | (ctx->ubwc->ubwc_swizzle) | (hbb << 4);
>
> This is pre-existing, but BIT(30) is not unconditional in SDE for v3
When somebody adds inline rotator support for DPU 6.x (SM8250, SM6350,
SM7250 or SM7350), this bit will become conditional.
>
> For this patch
>
> Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
>
> Konrad
>
--
With best wishes
Dmitry
© 2016 - 2026 Red Hat, Inc.