diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-11-08 09:32:24 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-11-08 09:32:24 -0800 |
| commit | 91e43395820baad80248987608216c35da9df65b (patch) | |
| tree | 29d41d1a036eb1abd6a60f16ad37aa578acd8159 /drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | |
| parent | eef3dc34a1e0b01d53328b88c25237bcc7323777 (diff) | |
| parent | cec83ff1241ec98113a19385ea9e9cfa9aa4125b (diff) | |
Merge branch 'fixes-dts' into omap-for-v4.20/fixes
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c index fb1667b35daa..12f2bf97611f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c @@ -226,6 +226,8 @@ static bool amdgpu_sa_bo_next_hole(struct amdgpu_sa_manager *sa_manager, for (i = 0; i < AMDGPU_SA_NUM_FENCE_LISTS; ++i) { struct amdgpu_sa_bo *sa_bo; + fences[i] = NULL; + if (list_empty(&sa_manager->flist[i])) continue; @@ -296,10 +298,8 @@ int amdgpu_sa_bo_new(struct amdgpu_sa_manager *sa_manager, spin_lock(&sa_manager->wq.lock); do { - for (i = 0; i < AMDGPU_SA_NUM_FENCE_LISTS; ++i) { - fences[i] = NULL; + for (i = 0; i < AMDGPU_SA_NUM_FENCE_LISTS; ++i) tries[i] = 0; - } do { amdgpu_sa_bo_try_free(sa_manager); |