This is a note to let you know that I've just added the patch titled
drm/msm/a6xx: fix incorrectly set uavflagprd_inv field for A650
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-msm-a6xx-fix-incorrectly-set-uavflagprd_inv-field-for-a650.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From b4387eaf3821a4c4241ac3a556e13244eb1fdaa5 Mon Sep 17 00:00:00 2001
From: Jonathan Marek <jonathan@xxxxxxxx>
Date: Thu, 13 May 2021 13:13:58 -0400
Subject: drm/msm/a6xx: fix incorrectly set uavflagprd_inv field for A650
From: Jonathan Marek <jonathan@xxxxxxxx>
commit b4387eaf3821a4c4241ac3a556e13244eb1fdaa5 upstream.
Value was shifted in the wrong direction, resulting in the field always
being zero, which is incorrect for A650.
Fixes: d0bac4e9cd66 ("drm/msm/a6xx: set ubwc config for A640 and A650")
Signed-off-by: Jonathan Marek <jonathan@xxxxxxxx>
Reviewed-by: Akhil P Oommen <akhilpo@xxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20210513171431.18632-4-jonathan@xxxxxxxx
Signed-off-by: Rob Clark <robdclark@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -486,7 +486,7 @@ static void a6xx_set_ubwc_config(struct
rgb565_predicator << 11 | amsbc << 4 | lower_bit << 1);
gpu_write(gpu, REG_A6XX_TPL1_NC_MODE_CNTL, lower_bit << 1);
gpu_write(gpu, REG_A6XX_SP_NC_MODE_CNTL,
- uavflagprd_inv >> 4 | lower_bit << 1);
+ uavflagprd_inv << 4 | lower_bit << 1);
gpu_write(gpu, REG_A6XX_UCHE_MODE_CNTL, lower_bit << 21);
}
Patches currently in stable-queue which might be from jonathan@xxxxxxxx are
queue-5.10/drm-msm-a6xx-avoid-shadow-null-reference-in-failure-path.patch
queue-5.10/drm-msm-a6xx-fix-incorrectly-set-uavflagprd_inv-field-for-a650.patch
queue-5.10/drm-msm-a6xx-update-fix-cp_protect-initialization.patch
