Commit 25f1734b8fc6531dce3b8c9de5423bee71b76035

Authored by Alex Deucher
Committed by Greg Kroah-Hartman
1 parent 1417cc5548

drm/radeon: make missing smc ucode non-fatal (r7xx-SI)

commit d83671126dc8e7c0b56c9970ea5ffd08c3b0c645 upstream.

Prevent driver load problems if the smc is missing.

bug:
https://bugzilla.kernel.org/show_bug.cgi?id=63011

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Tested-by: Mikko Rapeli <mikko.rapeli@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 3 changed files with 3 additions and 0 deletions Side-by-side Diff

drivers/gpu/drm/radeon/ni.c
... ... @@ -800,6 +800,7 @@
800 800 fw_name);
801 801 release_firmware(rdev->smc_fw);
802 802 rdev->smc_fw = NULL;
  803 + err = 0;
803 804 } else if (rdev->smc_fw->size != smc_req_size) {
804 805 printk(KERN_ERR
805 806 "ni_mc: Bogus length %zu in firmware \"%s\"\n",
drivers/gpu/drm/radeon/r600.c
... ... @@ -2310,6 +2310,7 @@
2310 2310 fw_name);
2311 2311 release_firmware(rdev->smc_fw);
2312 2312 rdev->smc_fw = NULL;
  2313 + err = 0;
2313 2314 } else if (rdev->smc_fw->size != smc_req_size) {
2314 2315 printk(KERN_ERR
2315 2316 "smc: Bogus length %zu in firmware \"%s\"\n",
drivers/gpu/drm/radeon/si.c
... ... @@ -1669,6 +1669,7 @@
1669 1669 fw_name);
1670 1670 release_firmware(rdev->smc_fw);
1671 1671 rdev->smc_fw = NULL;
  1672 + err = 0;
1672 1673 } else if (rdev->smc_fw->size != smc_req_size) {
1673 1674 printk(KERN_ERR
1674 1675 "si_smc: Bogus length %zu in firmware \"%s\"\n",