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>

diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
index 8becbe09af2f5c594172b061eb82f44d4b7114d3..bfacf8fe5cc16931cbc96313d00019380143180c 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_asic.c
+++ b/drivers/gpu/drm/radeon/radeon_asic.c
@@ -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;

diff --git a/drivers/gpu/drm/radeon/radeon_vce.c b/drivers/gpu/drm/radeon/radeon_vce.c
index a450497368b22462846cadd478aa810435b357bd..511a942e851db8d273a85120c66f0d14b4cb0529 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_vce.c
+++ b/drivers/gpu/drm/radeon/radeon_vce.c
@@ -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;

diff --git a/drivers/gpu/drm/radeon/vce_v1_0.c b/drivers/gpu/drm/radeon/vce_v1_0.c
index 70c5da2141d7598003704b76aba04158f7188794..bdfbcf14b86405b2684de932a34c63192e43b976 100644 (file)
--- a/drivers/gpu/drm/radeon/vce_v1_0.c
+++ b/drivers/gpu/drm/radeon/vce_v1_0.c
@@ -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: