From c837a685eefd79d23c42ece370f3c74713d73385 Mon Sep 17 00:00:00 2001 From: Freedo Date: Fri, 17 May 2024 21:55:39 +0000 Subject: [PATCH] GNU Linux-libre 6.8.10-gnu scripts --- deblob-6.8 | 11 +++++++---- deblob-check | 4 ++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/deblob-6.8 b/deblob-6.8 index f7322260dc37..a1087062af1d 100755 --- a/deblob-6.8 +++ b/deblob-6.8 @@ -923,12 +923,15 @@ 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' diff --git a/deblob-check b/deblob-check index 3c9d953468cd..626e1e485ee8 100755 --- a/deblob-check +++ b/deblob-check @@ -5,6 +5,7 @@ # modified with 2024-03-29 r19515 # modified with 2024-03-29 r19518 # modified with 2024-04-14 r19529 +# modified with 2024-04-28 r19540 # Inspired in gNewSense's find-firmware script. # Written by Alexandre Oliva @@ -7295,6 +7296,9 @@ set_except () { blobname 'iwlwifi-\(sc\)-[ab]0-\(fm\|hr\|gf4\?\|wh\)-[abc]0' drivers/net/wireless/intel/iwlwifi/cfg/sc.c blobname 'iwlwifi-[^ ]*-[ab]0-' drivers/net/wireless/intel/iwlwifi/cfg/22000.c + # New in 6.9-rc, 6.8.10. + blobname 'amdgpu[/]dcn_3_5_1_dmcub\.bin' drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c + ;; */*freedo*.patch | */*logo*.patch) -- 2.31.1