GNU Linux-libre 6.6.32-gnu scripts

[releases.git] / deblob-6.6

diff --git a/deblob-6.6 b/deblob-6.6
index 0cbee13331f6ea3f8fb3e9172a12b9f837920c35..0013935f1fa51cfad2692892a5c667bb56b4d60e 100755 (executable)
--- a/deblob-6.6
+++ b/deblob-6.6
@@ -830,6 +830,9 @@ clean_blob drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
 clean_blob drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
 clean_blob drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
 clean_blob drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
+if grep -q request_firmware drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c; then
+  reject_firmware drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+fi
 clean_blob drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
 clean_blob drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
 clean_blob drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
@@ -899,12 +902,18 @@ clean_blob drivers/gpu/drm/i915/display/intel_dmc.c
 reject_firmware drivers/gpu/drm/i915/display/intel_opregion.c
 reject_firmware drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
 clean_sed '/uc_fw->file_selected\.path = blob->path/ i\
-               else if (uc_fw->file_wanted.path == blob->path)\
-                       /* Avoid retrying forever when neighbor\
-                          entries point to the same path.  */\
+               else if (blob->path == NONFREE_FIRMWARE)\
+                       /* Never select an entry we would refuse to load.\
+                          If we find nothing, loading is disabled but the card\
+                          initialization proceeds as if the user had disabled\
+                          firmware, but if we found something that failed to load,\
+                          initialization would fail.  */\
                        continue;\
 
-' drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c 'avoid infinite loop'
+' drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c 'disable non-Free firmware'
+clean_sed '/Versionless file names must be unique/ i\
+           if (fw_blobs[i].blob.path != NONFREE_FIRMWARE)
+' drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c 'avoid validation fails'
 clean_blob drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
 clean_blob drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
 clean_kconfig drivers/gpu/drm/i915/Kconfig DRM_I915