diff options
author | Dave Airlie <airlied@redhat.com> | 2017-03-30 21:50:30 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-03-30 21:50:30 -0400 |
commit | 4adf04361b97ae198394cf44839e481aac317023 (patch) | |
tree | 30a50c88aab59af2b233f504722dab0590245527 | |
parent | 7502add2210f8cd9f761c9f25c46f566d1b7305e (diff) | |
parent | ce4b4f228e51219b0b79588caf73225b08b5b779 (diff) |
Merge branch 'drm-fixes-4.11' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
One small fix for radeon.
* 'drm-fixes-4.11' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: Override fpfn for all VRAM placements in radeon_evict_flags
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_ttm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 684f1703aa5c..aaa3e80fecb4 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c | |||
@@ -213,8 +213,8 @@ static void radeon_evict_flags(struct ttm_buffer_object *bo, | |||
213 | rbo->placement.num_busy_placement = 0; | 213 | rbo->placement.num_busy_placement = 0; |
214 | for (i = 0; i < rbo->placement.num_placement; i++) { | 214 | for (i = 0; i < rbo->placement.num_placement; i++) { |
215 | if (rbo->placements[i].flags & TTM_PL_FLAG_VRAM) { | 215 | if (rbo->placements[i].flags & TTM_PL_FLAG_VRAM) { |
216 | if (rbo->placements[0].fpfn < fpfn) | 216 | if (rbo->placements[i].fpfn < fpfn) |
217 | rbo->placements[0].fpfn = fpfn; | 217 | rbo->placements[i].fpfn = fpfn; |
218 | } else { | 218 | } else { |
219 | rbo->placement.busy_placement = | 219 | rbo->placement.busy_placement = |
220 | &rbo->placements[i]; | 220 | &rbo->placements[i]; |