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

Commit 28a39654 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-next-4.9' of git://people.freedesktop.org/~agd5f/linux into drm-next 

Some additional fixes for 4.9:
- The rest of Christian's GTT rework which fixes a long standing bug
  in the GPUVM code among other things
- Changes to the pci shutdown callbacks for certain hypervisors
- Fix hpd interrupt storms on eDP panels which have the hpd interrupt
  enabled by the bios
- misc cleanups and bug fixes

* 'drm-next-4.9' of git://people.freedesktop.org/~agd5f/linux: (33 commits)
  drm/radeon: always apply pci shutdown callbacks
  drm/amdgpu: always apply pci shutdown callbacks (v2)
  drm/amdgpu: improve VM PTE trace points
  drm/amdgpu: fix GART_DEBUGFS define
  drm/amdgpu: free userptrs even if GTT isn't bound
  drm/amd/amdgpu: Various cleanups for DCEv6
  drm/amdgpu: fix BO move offsets
  drm/amdgpu: fix amdgpu_move_blit on 32bit systems
  drm/amdgpu: fix gtt_mgr bo's offset
  drm/amdgpu: fix initializing the VM BO shadow
  drm/amdgpu: fix initializing the VM last eviction counter
  drm/amdgpu: cleanup VM shadow BO unreferencing
  drm/amdgpu: allocate GTT space for shadow VM page tables
  drm/amdgpu: rename all rbo variable to abo v2
  drm/amdgpu: remove unused member from struct amdgpu_bo
  drm/amdgpu: add a custom GTT memory manager v2
  drm/amdgpu/dce6: disable hpd on local panels
  drm/amdgpu/dce8: disable hpd on local panels
  drm/amdgpu/dce11: disable hpd on local panels
  drm/amdgpu/dce10: disable hpd on local panels
  ...
parents b2d7e089 a481daa8

drivers/gpu/drm/amd/amdgpu/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ 
	amdgpu_pm.o atombios_dp.o amdgpu_afmt.o amdgpu_trace_points.o \

	atombios_encoders.o amdgpu_sa.o atombios_i2c.o \

	amdgpu_prime.o amdgpu_vm.o amdgpu_ib.o amdgpu_pll.o \

	amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o

	amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o \

	amdgpu_gtt_mgr.o



# add asic specific block

amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o kv_smc.o kv_dpm.o \

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+2 −4
Original line number Diff line number Diff line
@@ -445,8 +445,6 @@ struct amdgpu_bo_va { 
#define AMDGPU_GEM_DOMAIN_MAX		0x3



struct amdgpu_bo {

	/* Protected by gem.mutex */

	struct list_head		list;

	/* Protected by tbo.reserved */

	u32				prefered_domains;

	u32				allowed_domains;
@@ -704,7 +702,7 @@ struct amdgpu_flip_work { 
	u32				target_vblank;

	uint64_t			base;

	struct drm_pending_vblank_event *event;

	struct amdgpu_bo		*old_rbo;

	struct amdgpu_bo		*old_abo;

	struct fence			*excl;

	unsigned			shared_count;

	struct fence			**shared;
@@ -2417,7 +2415,7 @@ int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data); 
int amdgpu_cs_get_ring(struct amdgpu_device *adev, u32 ip_type,

		       u32 ip_instance, u32 ring,

		       struct amdgpu_ring **out_ring);

void amdgpu_ttm_placement_from_domain(struct amdgpu_bo *rbo, u32 domain);

void amdgpu_ttm_placement_from_domain(struct amdgpu_bo *abo, u32 domain);

bool amdgpu_ttm_bo_is_amdgpu_bo(struct ttm_buffer_object *bo);

int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages);

int amdgpu_ttm_tt_set_userptr(struct ttm_tt *ttm, uint64_t addr,

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

+2 −2
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, 
	if (!r && p->uf_entry.robj) {

		struct amdgpu_bo *uf = p->uf_entry.robj;



		r = amdgpu_ttm_bind(uf->tbo.ttm, &uf->tbo.mem);

		r = amdgpu_ttm_bind(&uf->tbo, &uf->tbo.mem);

		p->job->uf_addr += amdgpu_bo_gpu_offset(uf);

	}
@@ -1192,7 +1192,7 @@ int amdgpu_cs_sysvm_access_required(struct amdgpu_cs_parser *parser) 
	for (i = 0; i < parser->bo_list->num_entries; i++) {

		struct amdgpu_bo *bo = parser->bo_list->array[i].robj;



		r = amdgpu_ttm_bind(bo->tbo.ttm, &bo->tbo.mem);

		r = amdgpu_ttm_bind(&bo->tbo, &bo->tbo.mem);

		if (unlikely(r))

			return r;

	}

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

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ static int amdgpu_ctx_init(struct amdgpu_device *adev, struct amdgpu_ctx *ctx) 
			amd_sched_entity_fini(&adev->rings[j]->sched,

					      &ctx->rings[j].entity);

		kfree(ctx->fences);

		ctx->fences = NULL;

		return r;

	}

	return 0;
@@ -77,6 +78,7 @@ static void amdgpu_ctx_fini(struct amdgpu_ctx *ctx) 
		for (j = 0; j < amdgpu_sched_jobs; ++j)

			fence_put(ctx->rings[i].fences[j]);

	kfree(ctx->fences);

	ctx->fences = NULL;



	for (i = 0; i < adev->num_rings; i++)

		amd_sched_entity_fini(&adev->rings[i]->sched,

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

+21 −21
Original line number Diff line number Diff line
@@ -123,17 +123,17 @@ static void amdgpu_unpin_work_func(struct work_struct *__work) 
	int r;



	/* unpin of the old buffer */

	r = amdgpu_bo_reserve(work->old_rbo, false);

	r = amdgpu_bo_reserve(work->old_abo, false);

	if (likely(r == 0)) {

		r = amdgpu_bo_unpin(work->old_rbo);

		r = amdgpu_bo_unpin(work->old_abo);

		if (unlikely(r != 0)) {

			DRM_ERROR("failed to unpin buffer after flip\n");

		}

		amdgpu_bo_unreserve(work->old_rbo);

		amdgpu_bo_unreserve(work->old_abo);

	} else

		DRM_ERROR("failed to reserve buffer after flip\n");



	amdgpu_bo_unref(&work->old_rbo);

	amdgpu_bo_unref(&work->old_abo);

	kfree(work->shared);

	kfree(work);

}
@@ -150,7 +150,7 @@ int amdgpu_crtc_page_flip_target(struct drm_crtc *crtc, 
	struct amdgpu_framebuffer *new_amdgpu_fb;

	struct drm_gem_object *obj;

	struct amdgpu_flip_work *work;

	struct amdgpu_bo *new_rbo;

	struct amdgpu_bo *new_abo;

	unsigned long flags;

	u64 tiling_flags;

	u64 base;
@@ -173,28 +173,28 @@ int amdgpu_crtc_page_flip_target(struct drm_crtc *crtc, 
	obj = old_amdgpu_fb->obj;



	/* take a reference to the old object */

	work->old_rbo = gem_to_amdgpu_bo(obj);

	amdgpu_bo_ref(work->old_rbo);

	work->old_abo = gem_to_amdgpu_bo(obj);

	amdgpu_bo_ref(work->old_abo);



	new_amdgpu_fb = to_amdgpu_framebuffer(fb);

	obj = new_amdgpu_fb->obj;

	new_rbo = gem_to_amdgpu_bo(obj);

	new_abo = gem_to_amdgpu_bo(obj);



	/* pin the new buffer */

	r = amdgpu_bo_reserve(new_rbo, false);

	r = amdgpu_bo_reserve(new_abo, false);

	if (unlikely(r != 0)) {

		DRM_ERROR("failed to reserve new rbo buffer before flip\n");

		DRM_ERROR("failed to reserve new abo buffer before flip\n");

		goto cleanup;

	}



	r = amdgpu_bo_pin_restricted(new_rbo, AMDGPU_GEM_DOMAIN_VRAM, 0, 0, &base);

	r = amdgpu_bo_pin_restricted(new_abo, AMDGPU_GEM_DOMAIN_VRAM, 0, 0, &base);

	if (unlikely(r != 0)) {

		r = -EINVAL;

		DRM_ERROR("failed to pin new rbo buffer before flip\n");

		DRM_ERROR("failed to pin new abo buffer before flip\n");

		goto unreserve;

	}



	r = reservation_object_get_fences_rcu(new_rbo->tbo.resv, &work->excl,

	r = reservation_object_get_fences_rcu(new_abo->tbo.resv, &work->excl,

					      &work->shared_count,

					      &work->shared);

	if (unlikely(r != 0)) {
@@ -202,8 +202,8 @@ int amdgpu_crtc_page_flip_target(struct drm_crtc *crtc, 
		goto unpin;

	}



	amdgpu_bo_get_tiling_flags(new_rbo, &tiling_flags);

	amdgpu_bo_unreserve(new_rbo);

	amdgpu_bo_get_tiling_flags(new_abo, &tiling_flags);

	amdgpu_bo_unreserve(new_abo);



	work->base = base;

	work->target_vblank = target - drm_crtc_vblank_count(crtc) +
@@ -231,19 +231,19 @@ int amdgpu_crtc_page_flip_target(struct drm_crtc *crtc, 
	return 0;



pflip_cleanup:

	if (unlikely(amdgpu_bo_reserve(new_rbo, false) != 0)) {

		DRM_ERROR("failed to reserve new rbo in error path\n");

	if (unlikely(amdgpu_bo_reserve(new_abo, false) != 0)) {

		DRM_ERROR("failed to reserve new abo in error path\n");

		goto cleanup;

	}

unpin:

	if (unlikely(amdgpu_bo_unpin(new_rbo) != 0)) {

		DRM_ERROR("failed to unpin new rbo in error path\n");

	if (unlikely(amdgpu_bo_unpin(new_abo) != 0)) {

		DRM_ERROR("failed to unpin new abo in error path\n");

	}

unreserve:

	amdgpu_bo_unreserve(new_rbo);

	amdgpu_bo_unreserve(new_abo);



cleanup:

	amdgpu_bo_unref(&work->old_rbo);

	amdgpu_bo_unref(&work->old_abo);

	fence_put(work->excl);

	for (i = 0; i < work->shared_count; ++i)

		fence_put(work->shared[i]);