diff --git a/helpers/DATA/linux/silent-accept-firmware.patch b/helpers/DATA/linux/silent-accept-firmware.patch index 48e2dbc18ca2532d997571be16a4434d8d2231b9..fa3fded32eac1d12febd6682dd9569cd794c6ae5 100644 --- a/helpers/DATA/linux/silent-accept-firmware.patch +++ b/helpers/DATA/linux/silent-accept-firmware.patch @@ -673,88 +673,6 @@ diff -ur a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c release_firmware(rdev->pfp_fw); rdev->pfp_fw = NULL; release_firmware(rdev->me_fw); -diff -ur a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c ---- a/drivers/gpu/drm/radeon/ni.c 2019-11-25 01:32:01.000000000 +0100 -+++ b/drivers/gpu/drm/radeon/ni.c 2021-06-25 14:54:58.332092667 +0200 -@@ -770,15 +770,15 @@ - default: BUG(); - } - -- DRM_INFO("Loading %s Microcode\n", chip_name); -+ DRM_INFO("Loading Microcode\n"); - - snprintf(fw_name, sizeof(fw_name), "radeon/%s_pfp.bin", chip_name); - err = request_firmware(&rdev->pfp_fw, fw_name, rdev->dev); - if (err) - goto out; - if (rdev->pfp_fw->size != pfp_req_size) { -- pr_err("ni_cp: Bogus length %zu in firmware \"%s\"\n", -- rdev->pfp_fw->size, fw_name); -+ pr_err("ni_cp: Bogus length %zu in firmware\n", -+ rdev->pfp_fw->size); - err = -EINVAL; - goto out; - } -@@ -788,8 +788,8 @@ - if (err) - goto out; - if (rdev->me_fw->size != me_req_size) { -- pr_err("ni_cp: Bogus length %zu in firmware \"%s\"\n", -- rdev->me_fw->size, fw_name); -+ pr_err("ni_cp: Bogus length %zu in firmware\n", -+ rdev->me_fw->size); - err = -EINVAL; - } - -@@ -798,8 +798,8 @@ - if (err) - goto out; - if (rdev->rlc_fw->size != rlc_req_size) { -- pr_err("ni_rlc: Bogus length %zu in firmware \"%s\"\n", -- rdev->rlc_fw->size, fw_name); -+ pr_err("ni_rlc: Bogus length %zu in firmware\n", -+ rdev->rlc_fw->size); - err = -EINVAL; - } - -@@ -810,8 +810,8 @@ - if (err) - goto out; - if (rdev->mc_fw->size != mc_req_size) { -- pr_err("ni_mc: Bogus length %zu in firmware \"%s\"\n", -- rdev->mc_fw->size, fw_name); -+ pr_err("ni_mc: Bogus length %zu in firmware\n", -+ rdev->mc_fw->size); - err = -EINVAL; - } - } -@@ -820,13 +820,13 @@ - snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name); - err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev); - if (err) { -- pr_err("smc: error loading firmware \"%s\"\n", fw_name); -+ pr_err("smc: error loading firmware\n"); - release_firmware(rdev->smc_fw); - rdev->smc_fw = NULL; - err = 0; - } else if (rdev->smc_fw->size != smc_req_size) { -- pr_err("ni_mc: Bogus length %zu in firmware \"%s\"\n", -- rdev->mc_fw->size, fw_name); -+ pr_err("ni_mc: Bogus length %zu in firmware\n", -+ rdev->mc_fw->size); - err = -EINVAL; - } - } -@@ -834,8 +834,7 @@ - out: - if (err) { - if (err != -EINVAL) -- pr_err("ni_cp: Failed to load firmware \"%s\"\n", -- fw_name); -+ pr_err("ni_cp: Failed to load firmware\n"); - release_firmware(rdev->pfp_fw); - rdev->pfp_fw = NULL; - release_firmware(rdev->me_fw); diff -ur a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c --- a/drivers/gpu/drm/radeon/r100.c 2021-06-25 14:52:20.000000000 +0200 +++ b/drivers/gpu/drm/radeon/r100.c 2021-06-25 14:54:58.332092667 +0200 diff --git a/helpers/make-linux b/helpers/make-linux index 5fbc7e612cb19cfe931abdb26883cefb760b0715..31d8918b8c8e9a0f5423aa608c16e87686415a1a 100644 --- a/helpers/make-linux +++ b/helpers/make-linux @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=9 +VERSION=10 . ./config @@ -57,6 +57,9 @@ for DIR in $PRESERVEDIRS; do cp $DIR $TMPDIR --parents -a done +# Enable blobless activation - https://libreplanet.org/wiki/Group:Hardware/research/gpu/radeon +rm $TMPDIR/drivers/gpu/drm/radeon/ni.c + sh $DATA/deblob-5.4 echo "Reverting deblobbing for files patched by silent-accept-firmware"