Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73bf1b7b authored by Dave Airlie's avatar Dave Airlie
Browse files

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)
parents 5b78cb66 35c7a952

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p) 
			 * into account. We don't want to disallow buffer moves

			 * completely.

			 */

			if (current_domain != AMDGPU_GEM_DOMAIN_CPU &&

			if ((lobj->allowed_domains & current_domain) != 0 &&

			    (domain & current_domain) == 0 && /* will be moved */

			    bytes_moved > bytes_moved_threshold) {

				/* don't move it */

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+2 −1
Original line number Diff line number Diff line
@@ -244,7 +244,8 @@ static int amdgpu_vram_scratch_init(struct amdgpu_device *adev) 


	if (adev->vram_scratch.robj == NULL) {

		r = amdgpu_bo_create(adev, AMDGPU_GPU_PAGE_SIZE,

				     PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_VRAM, 0,

				     PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_VRAM,

				     AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,

				     NULL, &adev->vram_scratch.robj);

		if (r) {

			return r;

drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c

+2 −2
Original line number Diff line number Diff line
@@ -126,8 +126,8 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, 
	aligned_size = ALIGN(size, PAGE_SIZE);

	ret = amdgpu_gem_object_create(adev, aligned_size, 0,

				       AMDGPU_GEM_DOMAIN_VRAM,

				       0, true,

				       &gobj);

				       AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,

				       true, &gobj);

	if (ret) {

		printk(KERN_ERR "failed to allocate framebuffer (%d)\n",

		       aligned_size);

drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c

+2 −1
Original line number Diff line number Diff line
@@ -125,7 +125,8 @@ int amdgpu_gart_table_vram_alloc(struct amdgpu_device *adev) 


	if (adev->gart.robj == NULL) {

		r = amdgpu_bo_create(adev, adev->gart.table_size,

				     PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_VRAM, 0,

				     PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_VRAM,

				     AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,

				     NULL, &adev->gart.robj);

		if (r) {

			return r;

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c

+2 −1
Original line number Diff line number Diff line
@@ -656,7 +656,8 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv, 


	r = amdgpu_gem_object_create(adev, args->size, 0,

				     AMDGPU_GEM_DOMAIN_VRAM,

				     0, ttm_bo_type_device,

				     AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,

				     ttm_bo_type_device,

				     &gobj);

	if (r)

		return -ENOMEM;