From: Freedo <freedo@linux-libre.fsfla.org>
Date: Thu, 18 May 2023 05:59:27 +0000 (+0000)
Subject: GNU Linux-libre 6.2.16-gnu scripts
X-Git-Tag: scripts/v6.2.16-gnu^0
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=929db038dea71756a6f7abb114eb7714eec8faf0;p=releases.git

GNU Linux-libre 6.2.16-gnu scripts
---

diff --git a/deblob-6.2 b/deblob-6.2
index acdbd17974b..7406b62fa37 100755
--- a/deblob-6.2
+++ b/deblob-6.2
@@ -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/amd/amdgpu/Kconfig DRM_AMDGPU
 clean_mk CONFIG_DRM_AMDGPU drivers/gpu/drm/amd/amdgpu/Makefile
 
@@ -928,7 +938,6 @@ clean_sed '/uc_fw->file_selected\.path = blob->path/ i\
 			/* Avoid retrying forever when neighbor\
 			   entries point to the same path.  */\
 			continue;\
-\
 
 ' drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c 'avoid infinite loop'
 clean_blob drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
diff --git a/deblob-check b/deblob-check
index 6bf92f7eda6..cac8f29001e 100755
--- a/deblob-check
+++ b/deblob-check
@@ -3,7 +3,8 @@
 # deblob-check version 2023-02-05 r19039
 #        modified with 2023-03-10 r19100
 #        modified with 2023-03-17 r19120
-#        modified with 2023-04-13 r19170
+#        modified with 2023-04-13 r19170 (partial)
+#        modified with 2023-05-17 r19267
 # Inspired in gNewSense's find-firmware script.
 # Written by Alexandre Oliva <lxoliva@fsfla.org>
 
@@ -6660,7 +6661,7 @@ set_except () {
     # The following is not new, it was just moved down to allow for
     # new patterns to match despite being prefixed by it, when using
     # non-NDA regexp engines.
-    blobname 'amdgpu[/]%s' drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+    # blobname 'amdgpu[/]%s' drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
     blobname 'i915[/]["]\([ ][\\][\n][\t]__stringify[(]\(prefix\|major\|minor\|patch\)_[)]\([ ]\(name_\|["][.]["]\)\)\?\)*[ ]["]\.bin' drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
     defsc 'static[ ]struct[ ]convert_xrgb8888_case[ ]convert_xrgb8888_cases\[\][ ]=' drivers/gpu/drm/tests/drm_format_helper_test.c
     # bno055-caldata files are calibration data that can be saved from
@@ -6786,6 +6787,16 @@ set_except () {
     # New in 6.3-rc, 6.2.12.
     blobname 'qcom[/]sa8540p[/]cdsp0\.mbn' arch/arm64/boot/dts/qcom/sa8540p-ride.dts
 
+    # New in 6.2.16, 6.1.29.
+    accept '[ ][*][ ]This[ ]is[ ]a[ ]helper[ ]that[ ]will[ ]use[ ]request_firmware[ ]' drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
+    blobname 'amdgpu[/]%s_mes%s\.bin' drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
+    # The following is not new, it was just moved down to allow for
+    # new patterns to match despite being prefixed by it, when using
+    # non-NDA regexp engines.
+    blobname 'amdgpu[/]%s' drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+    # New in 6.3.3, 6.2.16, 6.1.29, 5.15.112, 5.10.180, 5.4.243, 4.19.283.
+    blobname 'gsl1680-dexp-ursus-kx210i\.fw' drivers/platform/x86/touchscreen_dmi.c
+
     ;;
 
   */*freedo*.patch | */*logo*.patch)