Commit 7e6435c1 authored by Alex Deucher's avatar 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=197327Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1fb8b1fc
...@@ -2478,6 +2478,9 @@ int radeon_asic_init(struct radeon_device *rdev) ...@@ -2478,6 +2478,9 @@ int radeon_asic_init(struct radeon_device *rdev)
if (rdev->family == CHIP_HAINAN) { if (rdev->family == CHIP_HAINAN) {
rdev->has_uvd = false; rdev->has_uvd = false;
rdev->has_vce = false; rdev->has_vce = false;
} else if (rdev->family == CHIP_OLAND) {
rdev->has_uvd = true;
rdev->has_vce = false;
} else { } else {
rdev->has_uvd = true; rdev->has_uvd = true;
rdev->has_vce = true; rdev->has_vce = true;
......
...@@ -68,7 +68,6 @@ int radeon_vce_init(struct radeon_device *rdev) ...@@ -68,7 +68,6 @@ int radeon_vce_init(struct radeon_device *rdev)
case CHIP_TAHITI: case CHIP_TAHITI:
case CHIP_PITCAIRN: case CHIP_PITCAIRN:
case CHIP_VERDE: case CHIP_VERDE:
case CHIP_OLAND:
case CHIP_ARUBA: case CHIP_ARUBA:
fw_name = FIRMWARE_TAHITI; fw_name = FIRMWARE_TAHITI;
break; break;
......
...@@ -169,7 +169,6 @@ int vce_v1_0_load_fw(struct radeon_device *rdev, uint32_t *data) ...@@ -169,7 +169,6 @@ int vce_v1_0_load_fw(struct radeon_device *rdev, uint32_t *data)
chip_id = 0x01000015; chip_id = 0x01000015;
break; break;
case CHIP_PITCAIRN: case CHIP_PITCAIRN:
case CHIP_OLAND:
chip_id = 0x01000016; chip_id = 0x01000016;
break; break;
case CHIP_ARUBA: case CHIP_ARUBA:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment