From: lxoliva <lxoliva@559672b5-ba27-0410-b829-e8f1faed8b1b>
Date: Thu, 18 May 2023 09:13:03 +0000 (+0000)
Subject: GNU Linux-libre 6.1.29-gnu
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=adf9b9d11e7314bc766d4007e35a2d3624116f60;p=releases.git

GNU Linux-libre 6.1.29-gnu



git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@19281 559672b5-ba27-0410-b829-e8f1faed8b1b
---

diff --git a/deblob-6.1 b/deblob-6.1
index 1aeba1e0a27..244eac3a4bb 100755
--- a/deblob-6.1
+++ b/deblob-6.1
@@ -846,9 +846,16 @@ reject_firmware drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
 clean_blob drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
 reject_firmware drivers/gpu/drm/amd/amdgpu/imu_v11_0.c
 clean_blob drivers/gpu/drm/amd/amdgpu/imu_v11_0.c
-reject_firmware drivers/gpu/drm/amd/amdgpu/mes_v10_1.c
+if grep -q request_firmware drivers/gpu/drm/amd/amdgpu/mes_v10_1.c; then
+  reject_firmware drivers/gpu/drm/amd/amdgpu/mes_v10_1.c
+fi
+if grep -q request_firmware drivers/gpu/drm/amd/amdgpu/mes_v11_0.c; then
+  reject_firmware drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
+fi
+if grep -q amdgpu_mes_init_microcode drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c; then
+  clean_blob drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
+fi
 clean_blob drivers/gpu/drm/amd/amdgpu/mes_v10_1.c
-reject_firmware drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
 clean_blob drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
 clean_blob drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
 reject_firmware drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
@@ -882,6 +889,9 @@ reject_firmware drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
 clean_blob drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
 reject_firmware drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
 clean_blob drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+if grep -q request_firmware drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c; then
+  reject_firmware drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
+fi
 clean_kconfig drivers/gpu/drm/Kconfig DRM_AMDGPU
 clean_mk CONFIG_DRM_AMDGPU drivers/gpu/drm/amd/amdgpu/Makefile