[PATCH] drm/amdgpu: fix VM size reporting on Raven

zhoucm1@xxxxxxx (zhoucm1) · Thu, 16 Aug 2018 10:08:27 +0800



On 2018å¹´08æ??15æ?¥ 20:05, Christian KÃ¶nig wrote:
> Raven doesn't have an VCE block and so also no buggy VCE firmware.
>
> Signed-off-by: Christian KÃ¶nig <christian.koenig at amd.com>
Acked-by: Chunming Zhou <david1.zhou at amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> index 7d3d76a1a9dd..2ecb883bdd41 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> @@ -619,7 +619,8 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
>   		vm_size -= AMDGPU_VA_RESERVED_SIZE;
>   
>   		/* Older VCE FW versions are buggy and can handle only 40bits */
> -		if (adev->vce.fw_version < AMDGPU_VCE_FW_53_45)
> +		if (adev->vce.fw_version &&
> +		    adev->vce.fw_version < AMDGPU_VCE_FW_53_45)
>   			vm_size = min(vm_size, 1ULL << 40);
>   
>   		dev_info.virtual_address_offset = AMDGPU_VA_RESERVED_SIZE;