Commit 7e6435c1 authored Feb 16, 2021 by Alex Deucher

drm/radeon: OLAND boards don't have VCE

Disable it on those boards.  No functional change, this just
removes the message about VCE failing to initialize.

Bug: https://bugzilla.kernel.org/show_bug.cgi?id=197327


Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 1fb8b1fc

drivers/gpu/drm/radeon/radeon_asic.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -2478,6 +2478,9 @@ int radeon_asic_init(struct radeon_device *rdev)
		if (rdev->family == CHIP_HAINAN) {
		rdev->has_uvd = false;
		rdev->has_vce = false;
		} else if (rdev->family == CHIP_OLAND) {
		rdev->has_uvd = true;
		rdev->has_vce = false;
		} else {
		rdev->has_uvd = true;
		rdev->has_vce = true;

drivers/gpu/drm/radeon/radeon_vce.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -68,7 +68,6 @@ int radeon_vce_init(struct radeon_device *rdev)
		case CHIP_TAHITI:
		case CHIP_PITCAIRN:
		case CHIP_VERDE:
		case CHIP_OLAND:
		case CHIP_ARUBA:
		fw_name = FIRMWARE_TAHITI;
		break;

drivers/gpu/drm/radeon/vce_v1_0.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -169,7 +169,6 @@ int vce_v1_0_load_fw(struct radeon_device rdev, uint32_t data)
		chip_id = 0x01000015;
		break;
		case CHIP_PITCAIRN:
		case CHIP_OLAND:
		chip_id = 0x01000016;
		break;
		case CHIP_ARUBA: