[PATCH 2/2] drm/amdgpu: allow harvesting check for Polaris VCE

[Alex Deucher]

On Wed, Nov 1, 2017 at 9:10 AM, Leo Liu <leo.liu at amd.com> wrote:
> Signed-off-by: Leo Liu <leo.liu at amd.com>

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
> index 90332f55cfba..cf81065e3c5a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
> @@ -365,15 +365,10 @@ static unsigned vce_v3_0_get_harvest_config(struct amdgpu_device *adev)
>  {
>         u32 tmp;
>
> -       /* Fiji, Stoney, Polaris10, Polaris11, Polaris12 are single pipe */
>         if ((adev->asic_type == CHIP_FIJI) ||
> -           (adev->asic_type == CHIP_STONEY) ||
> -           (adev->asic_type == CHIP_POLARIS10) ||
> -           (adev->asic_type == CHIP_POLARIS11) ||
> -           (adev->asic_type == CHIP_POLARIS12))
> +           (adev->asic_type == CHIP_STONEY))
>                 return AMDGPU_VCE_HARVEST_VCE1;
>
> -       /* Tonga and CZ are dual or single pipe */
>         if (adev->flags & AMD_IS_APU)
>                 tmp = (RREG32_SMC(ixVCE_HARVEST_FUSE_MACRO__ADDRESS) &
>                        VCE_HARVEST_FUSE_MACRO__MASK) >>
> @@ -391,6 +386,11 @@ static unsigned vce_v3_0_get_harvest_config(struct amdgpu_device *adev)
>         case 3:
>                 return AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1;
>         default:
> +               if ((adev->asic_type == CHIP_POLARIS10) ||
> +                   (adev->asic_type == CHIP_POLARIS11) ||
> +                   (adev->asic_type == CHIP_POLARIS12))
> +                       return AMDGPU_VCE_HARVEST_VCE1;
> +
>                 return 0;
>         }
>  }
> --
> 2.14.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx