[Mesa-dev] [PATCH] drm/radeon: Fix vram_size/visible values in DRM_RADEON_GEM_INFO ioctl

[Christian König]

Am 31.01.2017 um 07:54 schrieb Michel Dänzer:
> From: Michel Dänzer <michel.daenzer at amd.com>
>
> vram_size is supposed to be the total amount of VRAM that can be used by
> userspace, which corresponds to the TTM VRAM manager size (which is
> normally the full amount of VRAM, but can be just the visible VRAM when
> DMA can't be used for BO migration for some reason).
>
> The above was incorrectly used for vram_visible before, resulting in
> generally too large values being reported.
>
> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

Good catch, I wonder how long we have that in here.

Reviewed-by: Christian König <christian.koenig at amd.com> for this one as 
well the mesa patch.

Regards,
Christian.

> ---
>   drivers/gpu/drm/radeon/radeon_drv.c | 3 ++-
>   drivers/gpu/drm/radeon/radeon_gem.c | 4 ++--
>   2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
> index a252bc407aa2..88c41d43ec3d 100644
> --- a/drivers/gpu/drm/radeon/radeon_drv.c
> +++ b/drivers/gpu/drm/radeon/radeon_drv.c
> @@ -97,9 +97,10 @@
>    *   2.46.0 - Add PFP_SYNC_ME support on evergreen
>    *   2.47.0 - Add UVD_NO_OP register support
>    *   2.48.0 - TA_CS_BC_BASE_ADDR allowed on SI
> + *   2.49.0 - DRM_RADEON_GEM_INFO ioctl returns correct vram_size/visible values
>    */
>   #define KMS_DRIVER_MAJOR	2
> -#define KMS_DRIVER_MINOR	48
> +#define KMS_DRIVER_MINOR	49
>   #define KMS_DRIVER_PATCHLEVEL	0
>   int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);
>   int radeon_driver_unload_kms(struct drm_device *dev);
> diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
> index 0bcffd8a7bd3..96683f5b2b1b 100644
> --- a/drivers/gpu/drm/radeon/radeon_gem.c
> +++ b/drivers/gpu/drm/radeon/radeon_gem.c
> @@ -220,8 +220,8 @@ int radeon_gem_info_ioctl(struct drm_device *dev, void *data,
>   
>   	man = &rdev->mman.bdev.man[TTM_PL_VRAM];
>   
> -	args->vram_size = rdev->mc.real_vram_size;
> -	args->vram_visible = (u64)man->size << PAGE_SHIFT;
> +	args->vram_size = (u64)man->size << PAGE_SHIFT;
> +	args->vram_visible = rdev->mc.visible_vram_size;
>   	args->vram_visible -= rdev->vram_pin_size;
>   	args->gart_size = rdev->mc.gtt_size;
>   	args->gart_size -= rdev->gart_pin_size;