diff options
author | Dave Airlie <airlied@gmail.com> | 2015-09-04 17:46:09 -0400 |
---|---|---|
committer | Dave Airlie <airlied@gmail.com> | 2015-09-04 17:46:09 -0400 |
commit | 73bf1b7be7aab60d7c651402441dd0b0b4991098 (patch) | |
tree | 3499903ffa867506f32eb36a5d46aa747c729f94 /drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | |
parent | 5b78cb668764061bd8a06f73f9bd081ba6942fef (diff) | |
parent | 35c7a9526af75040fac744babd0fafe18b8fe0a1 (diff) |
Merge branch 'drm-next-4.3' of git://people.freedesktop.org/~agd5f/linux into drm-next
A few more fixes for amdgpu from the last few days:
- Fix several copy paste typos
- Resume from suspend fixes for VCE
- Fix the GPU scheduler warning in kfifo_out
- Re-enable GPUVM fault interrupts which were inadvertently disabled
- GPUVM page table hang fix when paging
* 'drm-next-4.3' of git://people.freedesktop.org/~agd5f/linux:
drm/amdgpu: rename gmc_v8_0_init_compute_vmid
drm/amdgpu: fix vce3 instance handling
drm/amdgpu: remove ib test for the second VCE Ring
drm/amdgpu: properly enable VM fault interrupts
drm/amdgpu: fix warning in scheduler
drm/amdgpu: fix buffer placement under memory pressure
drm/amdgpu/cz: fix cz_dpm_update_low_memory_pstate logic
drm/amdgpu: fix typo in dce11 watermark setup
drm/amdgpu: fix typo in dce10 watermark setup
drm/amdgpu: use top down allocation for non-CPU accessible vram
drm/amdgpu: be explicit about cpu vram access for driver BOs (v2)
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c index 4b36e779622f..5839fab374bf 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | |||
@@ -656,7 +656,8 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv, | |||
656 | 656 | ||
657 | r = amdgpu_gem_object_create(adev, args->size, 0, | 657 | r = amdgpu_gem_object_create(adev, args->size, 0, |
658 | AMDGPU_GEM_DOMAIN_VRAM, | 658 | AMDGPU_GEM_DOMAIN_VRAM, |
659 | 0, ttm_bo_type_device, | 659 | AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED, |
660 | ttm_bo_type_device, | ||
660 | &gobj); | 661 | &gobj); |
661 | if (r) | 662 | if (r) |
662 | return -ENOMEM; | 663 | return -ENOMEM; |