diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-11-04 13:48:08 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-11-04 13:48:08 +0300 |
| commit | 99e18df3a41a044c6ac83e5e8310c228221881c9 (patch) | |
| tree | 03aee44088bc0761e2bf2bb3985d64903ed3a4c5 /drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |
| parent | a1bb46c36ce389d4a24a42e5b6047b0626caa3ea (diff) | |
| parent | db0d32d84031188443e25edbd50a71a6e7ac5d1d (diff) | |
| download | linux-99e18df3a41a044c6ac83e5e8310c228221881c9.tar.xz | |
Merge back earlier cpufreq material for v5.5.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index 1fead0e8b890..7289e1b4fb60 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -453,7 +453,8 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, .interruptible = (bp->type != ttm_bo_type_kernel), .no_wait_gpu = false, .resv = bp->resv, - .flags = TTM_OPT_FLAG_ALLOW_RES_EVICT + .flags = bp->type != ttm_bo_type_kernel ? + TTM_OPT_FLAG_ALLOW_RES_EVICT : 0 }; struct amdgpu_bo *bo; unsigned long page_align, size = bp->size; |