From 0781756779582fab7bd5728b37d6ed2386155c64 Mon Sep 17 00:00:00 2001 From: Freedo Date: Fri, 17 May 2024 21:55:39 +0000 Subject: [PATCH] GNU Linux-libre 6.6.31-gnu scripts --- deblob-6.6 | 14 ++++++++++---- deblob-check | 5 +++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/deblob-6.6 b/deblob-6.6 index fe21795d862..0013935f1fa 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 diff --git a/deblob-check b/deblob-check index 690430dd9c9..f2e7f3b88a1 100755 --- a/deblob-check +++ b/deblob-check @@ -7,6 +7,7 @@ # modified with 2024-03-29 r19515 # modified with 2024-03-29 r19518 # modified with 2024-04-14 r19529 +# modified with 2023-12-26 r19450 (more partial) # Inspired in gNewSense's find-firmware script. # Written by Alexandre Oliva @@ -7131,8 +7132,12 @@ 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.7-rc7, 6.6.31, 6.1.91. + blobname 'qca[/]hpnv%02x%s\.\(bin\|%x\)' drivers/bluetooth/btqca.c + ;; + */*freedo*.patch | */*logo*.patch) accept 'P[13]\([\n]#[^\n]*\)*[\n]*\([\n][0-9 ]*\)\+' drivers/video/logo/logo_libre_clut224.ppm ;; -- 2.31.1