X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-6.6;h=0013935f1fa51cfad2692892a5c667bb56b4d60e;hb=5611cbde1c4ff89c36dca7be75794b92c15ac2e6;hp=fe21795d862f227a2d31faa9c7f38debbdc2627b;hpb=c9a157fd86e2bbe619fa12e101ce37bc0c6e02a6;p=releases.git

diff --git a/deblob-6.6 b/deblob-6.6
index fe21795d862f..0013935f1fa5 100755
--- a/deblob-6.6
+++ b/deblob-6.6
@@ -902,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