ni.c hwe enable blobless 10.0

This commit is contained in:
Luis Guzmán 2022-03-09 21:48:37 +00:00
parent f2cc6cb92b
commit 60bc04ac4f
4 changed files with 8 additions and 166 deletions

View file

@ -679,88 +679,6 @@ diff -ru 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 -ru a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
--- a/drivers/gpu/drm/radeon/ni.c 2021-06-14 01:15:31.736706702 +0200
+++ b/drivers/gpu/drm/radeon/ni.c 2021-06-14 01:16:26.480820708 +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 -ru a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
--- a/drivers/gpu/drm/radeon/r100.c 2021-06-14 01:15:31.736706702 +0200
+++ b/drivers/gpu/drm/radeon/r100.c 2021-06-14 01:37:19.785010983 +0200