Control: tag -1 + patch

Hi,

MNT Reform forum user deianara identified upstream commit
e0f48568c7f2a638213dee317fde03c23775556f as the origin of the regression on
BananaPI CM4. I verified that reverting this commit on top of mesa 25 indeed
fixes the problem. Patch attached.

On Thu, 27 Feb 2025 18:01:04 +0100 Martin Steigerwald <mar...@lichtvoll.de> 
wrote:
> Flickering and various graphics related glitches with
> mesa 25.0.0-1 on ThinkPad T14 AMD Gen 5 with AMD Ryzen 7 PRO 8840U
> w/ Radeon 780M Graphics:

your flicker effects are probably unrelated to the ones that this bug is about
because the fix for this bug is a change in mesa's panfrost driver which is
unrelated to your radeon card.

Thanks!

cheers, josch
diff -Nru mesa-25.0.0/debian/changelog mesa-25.0.0/debian/changelog
--- mesa-25.0.0/debian/changelog	2025-02-23 10:22:33.000000000 +0100
+++ mesa-25.0.0/debian/changelog	2025-03-01 11:27:41.000000000 +0100
@@ -1,3 +1,11 @@
+mesa (25.0.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Revert upstream commit e0f48568c7f2a638213dee317fde03c23775556f to fix
+    flickering on BananaPI CM4 with Arm Mali-G52 (Closes: #1099032)
+
+ --  <mmmm@localhost>  Sat, 01 Mar 2025 11:27:41 +0100
+
 mesa (25.0.0-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru mesa-25.0.0/debian/patches/0001-Revert-panfrost-Advertise-support-for-AFBC-32x8-spar.patch mesa-25.0.0/debian/patches/0001-Revert-panfrost-Advertise-support-for-AFBC-32x8-spar.patch
--- mesa-25.0.0/debian/patches/0001-Revert-panfrost-Advertise-support-for-AFBC-32x8-spar.patch	1970-01-01 01:00:00.000000000 +0100
+++ mesa-25.0.0/debian/patches/0001-Revert-panfrost-Advertise-support-for-AFBC-32x8-spar.patch	2025-03-01 11:27:26.000000000 +0100
@@ -0,0 +1,44 @@
+From 3b296fd4936c14f91d1ff46dd55b7d884cfb759c Mon Sep 17 00:00:00 2001
+From: Johannes Schauer Marin Rodrigues <jo...@mister-muffin.de>
+Date: Sat, 1 Mar 2025 11:11:25 +0100
+Subject: [PATCH] Revert "panfrost: Advertise support for
+ AFBC(32x8,sparse,split)"
+
+This reverts commit e0f48568c7f2a638213dee317fde03c23775556f.
+---
+ src/panfrost/lib/pan_layout.c  | 6 ------
+ src/panfrost/lib/pan_texture.h | 2 +-
+ 2 files changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/src/panfrost/lib/pan_layout.c b/src/panfrost/lib/pan_layout.c
+index 40408119195..3821fa418d6 100644
+--- a/src/panfrost/lib/pan_layout.c
++++ b/src/panfrost/lib/pan_layout.c
+@@ -36,12 +36,6 @@
+  * Similarly MTK 16L32 is only used if explicitly asked for.
+  */
+ uint64_t pan_best_modifiers[PAN_MODIFIER_COUNT] = {
+-   DRM_FORMAT_MOD_ARM_AFBC(AFBC_FORMAT_MOD_BLOCK_SIZE_32x8 |
+-                           AFBC_FORMAT_MOD_SPARSE | AFBC_FORMAT_MOD_SPLIT),
+-   DRM_FORMAT_MOD_ARM_AFBC(AFBC_FORMAT_MOD_BLOCK_SIZE_32x8 |
+-                           AFBC_FORMAT_MOD_SPARSE | AFBC_FORMAT_MOD_SPLIT |
+-                           AFBC_FORMAT_MOD_YTR),
+-
+    DRM_FORMAT_MOD_ARM_AFBC(AFBC_FORMAT_MOD_BLOCK_SIZE_16x16 |
+                            AFBC_FORMAT_MOD_TILED | AFBC_FORMAT_MOD_SC |
+                            AFBC_FORMAT_MOD_SPARSE | AFBC_FORMAT_MOD_YTR),
+diff --git a/src/panfrost/lib/pan_texture.h b/src/panfrost/lib/pan_texture.h
+index f0dab3cbf94..42fc7e7961e 100644
+--- a/src/panfrost/lib/pan_texture.h
++++ b/src/panfrost/lib/pan_texture.h
+@@ -47,7 +47,7 @@ extern "C" {
+ #define MAX_MIP_LEVELS   17
+ #define MAX_IMAGE_PLANES 3
+ 
+-#define PAN_MODIFIER_COUNT 15
++#define PAN_MODIFIER_COUNT 13
+ extern uint64_t pan_best_modifiers[PAN_MODIFIER_COUNT];
+ 
+ struct pan_image_slice_layout {
+-- 
+2.39.5
\ No newline at end of file
diff -Nru mesa-25.0.0/debian/patches/series mesa-25.0.0/debian/patches/series
--- mesa-25.0.0/debian/patches/series	2025-02-22 17:08:27.000000000 +0100
+++ mesa-25.0.0/debian/patches/series	2025-03-01 11:27:36.000000000 +0100
@@ -1,3 +1,4 @@
 path_max.diff
 src_glx_dri_common.h.diff
 disable_ppc64el_assembly.diff
+0001-Revert-panfrost-Advertise-support-for-AFBC-32x8-spar.patch

Attachment: signature.asc
Description: signature

Reply via email to