[PATCH] drm/radeon: OLAND boards don't have VCE

[Christian König]

Am 16.02.21 um 15:09 schrieb Alex Deucher:
> 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
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/radeon/radeon_asic.c | 3 +++
>   drivers/gpu/drm/radeon/radeon_vce.c  | 1 -
>   drivers/gpu/drm/radeon/vce_v1_0.c    | 1 -
>   3 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
> index 8becbe09af2f..bfacf8fe5cc1 100644
> --- 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 a450497368b2..511a942e851d 100644
> --- 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 70c5da2141d7..bdfbcf14b864 100644
> --- 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: