Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8367112 authored by Alex Deucher's avatar Alex Deucher
Browse files

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

Prevent driver load problems if the smc is missing.

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



Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Tested-by: default avatarMikko Rapeli <mikko.rapeli@iki.fi>
Cc: stable@vger.kernel.org
parent bcf6f1e9

drivers/gpu/drm/radeon/ni.c

+1 −0
Original line number Diff line number Diff line
@@ -804,6 +804,7 @@ int ni_init_microcode(struct radeon_device *rdev) 
			       fw_name);

			release_firmware(rdev->smc_fw);

			rdev->smc_fw = NULL;

			err = 0;

		} else if (rdev->smc_fw->size != smc_req_size) {

			printk(KERN_ERR

			       "ni_mc: Bogus length %zu in firmware \"%s\"\n",

drivers/gpu/drm/radeon/r600.c

+1 −0
Original line number Diff line number Diff line
@@ -2302,6 +2302,7 @@ int r600_init_microcode(struct radeon_device *rdev) 
			       fw_name);

			release_firmware(rdev->smc_fw);

			rdev->smc_fw = NULL;

			err = 0;

		} else if (rdev->smc_fw->size != smc_req_size) {

			printk(KERN_ERR

			       "smc: Bogus length %zu in firmware \"%s\"\n",

drivers/gpu/drm/radeon/si.c

+1 −0
Original line number Diff line number Diff line
@@ -1681,6 +1681,7 @@ static int si_init_microcode(struct radeon_device *rdev) 
		       fw_name);

		release_firmware(rdev->smc_fw);

		rdev->smc_fw = NULL;

		err = 0;

	} else if (rdev->smc_fw->size != smc_req_size) {

		printk(KERN_ERR

		       "si_smc: Bogus length %zu in firmware \"%s\"\n",