lkml.org 
[lkml]   [2015]   [Jan]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 075/176] drm/radeon: check the right ring in radeon_evict_flags()
    Date
    From: Alex Deucher <alexander.deucher@amd.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit 5e5c21cac1001089007260c48b0c89ebaace0e71 upstream.

    Check the that ring we are using for copies is functional
    rather than the GFX ring. On newer asics we use the DMA
    ring for bo moves.

    Reviewed-by: Christian König <christian.koenig@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/gpu/drm/radeon/radeon_ttm.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
    index 84323c943bfc..02d3c3820803 100644
    --- a/drivers/gpu/drm/radeon/radeon_ttm.c
    +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
    @@ -189,7 +189,7 @@ static void radeon_evict_flags(struct ttm_buffer_object *bo,
    rbo = container_of(bo, struct radeon_bo, tbo);
    switch (bo->mem.mem_type) {
    case TTM_PL_VRAM:
    - if (rbo->rdev->ring[RADEON_RING_TYPE_GFX_INDEX].ready == false)
    + if (rbo->rdev->ring[radeon_copy_ring_index(rbo->rdev)].ready == false)
    radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_CPU);
    else
    radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_GTT);
    --
    2.2.2


    \
     
     \ /
      Last update: 2015-01-29 10:21    [W:3.928 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site