lkml.org 
[lkml]   [2016]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 19/64] drm/amdgpu: fix amdgpu_bo_pin_restricted VRAM placing v2
    Date
    4.2.8-ckt4 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>

    commit 78d0e182b6c1f5336f6e8cbb197f403276dabc7f upstream.

    We could pin BOs into invisible VRAM otherwise.

    v2: make logic more readable as suggested by Michel

    Signed-off-by: Christian König <christian.koenig@amd.com>
    Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (v1)
    Reviewed-by: Rex Zhu <Rex.Zhu@amd.com> (v1)
    Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
    index 8da6424..9ada34f 100644
    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
    @@ -407,7 +407,8 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain,
    }
    if (fpfn > bo->placements[i].fpfn)
    bo->placements[i].fpfn = fpfn;
    - if (lpfn && lpfn < bo->placements[i].lpfn)
    + if (!bo->placements[i].lpfn ||
    + (lpfn && lpfn < bo->placements[i].lpfn))
    bo->placements[i].lpfn = lpfn;
    bo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT;
    }
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-02-05 00:41    [W:2.979 / U:0.792 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site