diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-10-26 14:49:44 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-10-26 14:49:44 +1000 |
| commit | 43106e25ab37580f54df99c512d1d66ae0fe1c67 (patch) | |
| tree | ff62b146f1c173d30e8cf767962cc87417edb71d /drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | |
| parent | 62884cd386b876638720ef88374b31a84ca7ee5f (diff) | |
| parent | 4a0144bfc6df1f7a89a04a3e8662f1f4375eb1fe (diff) | |
| download | kernel_replicant_linux-43106e25ab37580f54df99c512d1d66ae0fe1c67.tar.gz kernel_replicant_linux-43106e25ab37580f54df99c512d1d66ae0fe1c67.tar.bz2 kernel_replicant_linux-43106e25ab37580f54df99c512d1d66ae0fe1c67.zip | |
Merge branch 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux into drm-next
Just a few fixes for 4.15.
* 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux:
drm/amd/amdgpu: Remove workaround for suspend/resume in uvd7
drm/amdgpu: don't flush the TLB before initializing GART
drm/amdgpu: minor cleanup for amdgpu_ttm_bind
drm/amdgpu/psp: prevent page fault by checking write_frame address(v4)
drm/amd/powerplay: retrieve the real-time coreClock values
drm/amd/powerplay: fix performance drop on Vega10
drm/amd/powerplay: add one smc message for Vega10
drm/amd/powerplay: fix amd_powerplay_reset()
amdgpu: add padding to the fence to handle ioctl.
drm/amdgpu:fix wb_clear
drm/amdgpu:fix vf_error_put
drm/amdgpu/sriov:now must reinit psp
drm/amdgpu: merge bios post checking functions
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 51eacefadea1..b577b717caa0 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -909,7 +909,8 @@ int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem) placement.busy_placement = &placements; placements.fpfn = 0; placements.lpfn = adev->mc.gart_size >> PAGE_SHIFT; - placements.flags = bo->mem.placement | TTM_PL_FLAG_TT; + placements.flags = (bo->mem.placement & ~TTM_PL_MASK_MEM) | + TTM_PL_FLAG_TT; r = ttm_bo_mem_space(bo, &placement, &tmp, true, false); if (unlikely(r)) |