diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-10-25 07:48:53 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-10-25 07:48:53 +0300 |
| commit | 2a3608409f46e0bae5b6b1a77ddf4c42116698da (patch) | |
| tree | c8c1db74ce44a0436ab0681f578f7b3445aee5df /drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |
| parent | 20975806eb6f22873785cfd3f33fea008155e7fa (diff) | |
| parent | ee027828c40faa92a7ef4c2b0641bbb3f4be95d3 (diff) | |
| download | linux-2a3608409f46e0bae5b6b1a77ddf4c42116698da.tar.xz | |
Merge tag 'drm-fixes-5.4-2019-10-23' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
drm-fixes-5.4-2019-10-23:
amdgpu:
- Fix suspend/resume issue related to multi-media engines
- Fix memory leak in user ptr code related to hmm conversion
- Fix possible VM faults when allocating page table memory
- Fix error handling in bo list ioctl
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191024031809.3155-1-alexander.deucher@amd.com
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; |