diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk
index faf34268ef..def7a97071 100644
--- a/packages/graphics/mesa/package.mk
+++ b/packages/graphics/mesa/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mesa"
-PKG_VERSION="21.0.3"
-PKG_SHA256="565c6f4bd2d5747b919454fc1d439963024fc78ca56fd05158c3b2cde2f6912b"
+PKG_VERSION="21.2.0"
+PKG_SHA256="0cb3c802f4b8e7699b1602c08c29d06a4d532ab5b8f7a64676c4ca6bb8f4d426"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
 PKG_URL="https://mesa.freedesktop.org/archive/mesa-${PKG_VERSION}.tar.xz"
diff --git a/packages/graphics/mesa/patches/fix_for_ticket4605.patch b/packages/graphics/mesa/patches/fix_for_ticket4605.patch
deleted file mode 100644
index 64ddb9a12d..0000000000
--- a/packages/graphics/mesa/patches/fix_for_ticket4605.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur mesa-mesa-21.0.2-old/src/amd/common/ac_surface.c mesa-mesa-21.0.2-new/src/amd/common/ac_surface.c
---- mesa-mesa-21.0.2-old/src/amd/common/ac_surface.c	2021-04-07 18:35:30.000000000 +0200
-+++ mesa-mesa-21.0.2-new/src/amd/common/ac_surface.c	2021-04-11 11:35:23.939998177 +0200
-@@ -2878,10 +2826,6 @@
-       }
-    }
- 
--   if (offset & (surf->alignment - 1) ||
--       offset >= UINT64_MAX - surf->total_size)
--      return false;
--
-    if (surf->htile_offset)
-       surf->htile_offset += offset;
-    if (surf->fmask_offset)
diff --git a/packages/graphics/mesa/patches/mesa-999.01-lima-always-set-stride-in-texture-descriptor.patch b/packages/graphics/mesa/patches/mesa-999.01-lima-always-set-stride-in-texture-descriptor.patch
deleted file mode 100644
index f2e199ee2b..0000000000
--- a/packages/graphics/mesa/patches/mesa-999.01-lima-always-set-stride-in-texture-descriptor.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 696b0ab2c923024c865fa0ffdf725b2d4b6328d0 Mon Sep 17 00:00:00 2001
-From: Erico Nunes <nunes.erico@gmail.com>
-Date: Mon, 1 Feb 2021 01:27:50 +0100
-Subject: [PATCH] lima: always set stride in texture descriptor
-
-We can just always specify the stride parameter regardless of whether
-an alignment was forced or not. This fixes some issues where it is not
-straightforward to detect the need to specify stride by checking the
-buffer width (e.g. imported dmabuf to be used as texture).
-
-Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
-Reviewed-by: Vasily Khoruzhick <anarsoul@gmail.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8549>
----
- src/gallium/drivers/lima/lima_texture.c | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/src/gallium/drivers/lima/lima_texture.c b/src/gallium/drivers/lima/lima_texture.c
-index 4ac363178a9..7079865a3b5 100644
---- a/src/gallium/drivers/lima/lima_texture.c
-+++ b/src/gallium/drivers/lima/lima_texture.c
-@@ -91,11 +91,8 @@ lima_texture_desc_set_res(struct lima_context *ctx, lima_tex_desc *desc,
-    if (lima_res->tiled)
-       layout = 3;
-    else {
--      /* for padded linear texture */
--      if (lima_res->levels[first_level].width != width) {
--         desc->stride = lima_res->levels[first_level].stride;
--         desc->has_stride = 1;
--      }
-+      desc->stride = lima_res->levels[first_level].stride;
-+      desc->has_stride = 1;
-       layout = 0;
-    }
-