lkml.org 
[lkml]   [2022]   [Jun]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 121/141] drm/amdgpu: Fix GTT size reporting in amdgpu_ioctl
    Date
    From: Michel Dänzer <mdaenzer@redhat.com>

    commit c904e3acbab3fd97649cd4ab1ff7f1521ad3a255 upstream.

    The commit below changed the TTM manager size unit from pages to
    bytes, but failed to adjust the corresponding calculations in
    amdgpu_ioctl.

    Fixes: dfa714b88eb0 ("drm/amdgpu: remove GTT accounting v2")
    Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1930
    Bug: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6642
    Tested-by: Martin Roukala <martin.roukala@mupuf.org>
    Tested-by: Mike Lothian <mike@fireburn.co.uk>
    Reviewed-by: Christian König <christian.koenig@amd.com>
    Signed-off-by: Michel Dänzer <mdaenzer@redhat.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Cc: stable@vger.kernel.org # 5.18.x
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 --
    1 file changed, 2 deletions(-)

    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
    @@ -634,7 +634,6 @@ int amdgpu_info_ioctl(struct drm_device
    atomic64_read(&adev->visible_pin_size),
    vram_gtt.vram_size);
    vram_gtt.gtt_size = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT)->size;
    - vram_gtt.gtt_size *= PAGE_SIZE;
    vram_gtt.gtt_size -= atomic64_read(&adev->gart_pin_size);
    return copy_to_user(out, &vram_gtt,
    min((size_t)size, sizeof(vram_gtt))) ? -EFAULT : 0;
    @@ -667,7 +666,6 @@ int amdgpu_info_ioctl(struct drm_device
    mem.cpu_accessible_vram.usable_heap_size * 3 / 4;

    mem.gtt.total_heap_size = gtt_man->size;
    - mem.gtt.total_heap_size *= PAGE_SIZE;
    mem.gtt.usable_heap_size = mem.gtt.total_heap_size -
    atomic64_read(&adev->gart_pin_size);
    mem.gtt.heap_usage = ttm_resource_manager_usage(gtt_man);

    \
     
     \ /
      Last update: 2022-06-20 15:08    [W:3.547 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site