diff --git a/10440.patch b/10440.patch
new file mode 100644
index 0000000..1dfb71b
--- /dev/null
+++ b/10440.patch
@@ -0,0 +1,36 @@
+From 25fc9a4560221ccd4f6fb6e790650968531dea11 Mon Sep 17 00:00:00 2001
+From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
+Date: Sat, 24 Apr 2021 16:23:43 +0200
+Subject: [PATCH] amd/common: Add missing line from backport for coherency.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The line initializing the variable was missed.
+
+Fixes: ccc4abdbf4b ("ac/gpu_info: fix more non-coherent RB and GL2 combinations")
+Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4691
+Reviewed-by: Marek Olšák <marek.olsak@amd.com>
+Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
+Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10440>
+---
+ src/amd/common/ac_gpu_info.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c
+index 47e6b8c332f..44728827197 100644
+--- a/src/amd/common/ac_gpu_info.c
++++ b/src/amd/common/ac_gpu_info.c
+@@ -710,6 +710,8 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info,
+       info->num_tcc_blocks = info->max_tcc_blocks;
+    }
+ 
++   info->tcc_rb_non_coherent = !util_is_power_of_two_or_zero(info->num_tcc_blocks);
++
+    info->mc_arb_ramcfg = amdinfo->mc_arb_ramcfg;
+    info->gb_addr_config = amdinfo->gb_addr_cfg;
+    if (info->chip_class >= GFX9) {
+-- 
+GitLab
+
diff --git a/mesa.spec b/mesa.spec
index eaf63bd..203d67c 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -58,7 +58,7 @@ Name:           mesa
 Summary:        Mesa graphics libraries
 %global ver 21.0.3
 Version:        %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 URL:            http://www.mesa3d.org
 
@@ -71,6 +71,9 @@ Source1:        Mesa-MLAA-License-Clarification-Email.txt
 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/4442
 Patch0:         mesa-llvm12.patch
 
+# https://gitlab.freedesktop.org/mesa/mesa/-/issues/4691
+Patch1:         10440.patch
+
 BuildRequires:  meson >= 0.45
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -612,6 +615,9 @@ popd
 %endif
 
 %changelog
+* Thu Apr 29 2021 Kalev Lember <klember@redhat.com> - 21.0.3-2
+- Backport a fix for amdgpu graphics corruption regression
+
 * Thu Apr 22 2021 Pete Walter <pwalter@fedoraproject.org> - 21.0.3-1
 - Update to 21.0.3