From: Maxime Ripard <maxime@cerno.tech>
Date: Tue, 14 Sep 2021 07:25:30 +0000 (+0200)
Subject: Merge drm/drm-next into drm-misc-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2f76520561d01a5f37e6d6ed2c2e441b6a355a96;p=linux.git

Merge drm/drm-next into drm-misc-next

Kickstart new drm-misc-next cycle.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---

2f76520561d01a5f37e6d6ed2c2e441b6a355a96
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 489e22190e297,38dade421d465..1129e17e9f09c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@@ -1146,9 -1148,7 +1146,9 @@@ static void amdgpu_ttm_tt_unpopulate(st
  	struct amdgpu_ttm_tt *gtt = (void *)ttm;
  	struct amdgpu_device *adev;
  
 +	amdgpu_ttm_backend_unbind(bdev, ttm);
 +
- 	if (gtt && gtt->userptr) {
+ 	if (gtt->userptr) {
  		amdgpu_ttm_tt_set_user_pages(ttm, NULL);
  		kfree(ttm->sg);
  		ttm->sg = NULL;
diff --cc drivers/gpu/drm/i915/gem/i915_gem_ttm.c
index e646aac9d7a4b,35eedc14f5228..f0a61a9474fcc
--- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
@@@ -118,6 -214,8 +214,7 @@@ static void i915_ttm_tt_destroy(struct 
  {
  	struct i915_ttm_tt *i915_tt = container_of(ttm, typeof(*i915_tt), ttm);
  
 -	ttm_tt_destroy_common(bdev, ttm);
+ 	ttm_tt_fini(ttm);
  	kfree(i915_tt);
  }
  
diff --cc drivers/gpu/drm/panfrost/panfrost_mmu.c
index c3fbe0ad9090b,dfe5f1d297636..f7f83cf63f42b
--- a/drivers/gpu/drm/panfrost/panfrost_mmu.c
+++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c
@@@ -121,10 -112,10 +112,10 @@@ static void panfrost_mmu_enable(struct 
  	u64 transtab = cfg->arm_mali_lpae_cfg.transtab;
  	u64 memattr = cfg->arm_mali_lpae_cfg.memattr;
  
- 	mmu_hw_do_operation_locked(pfdev, as_nr, 0, ~0UL, AS_COMMAND_FLUSH_MEM);
+ 	mmu_hw_do_operation_locked(pfdev, as_nr, 0, ~0ULL, AS_COMMAND_FLUSH_MEM);
  
 -	mmu_write(pfdev, AS_TRANSTAB_LO(as_nr), transtab & 0xffffffffUL);
 -	mmu_write(pfdev, AS_TRANSTAB_HI(as_nr), transtab >> 32);
 +	mmu_write(pfdev, AS_TRANSTAB_LO(as_nr), lower_32_bits(transtab));
 +	mmu_write(pfdev, AS_TRANSTAB_HI(as_nr), upper_32_bits(transtab));
  
  	/* Need to revisit mem attrs.
  	 * NC is the default, Mali driver is inner WT.
diff --cc drivers/gpu/drm/ttm/ttm_bo.c
index 0a3127436f616,bb9e02c31946e..3b22c0013dbf6
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@@ -1124,12 -1160,12 +1124,12 @@@ int ttm_bo_swapout(struct ttm_buffer_ob
  	}
  
  	if (bo->deleted) {
- 		ttm_bo_cleanup_refs(bo, false, false, locked);
+ 		ret = ttm_bo_cleanup_refs(bo, false, false, locked);
  		ttm_bo_put(bo);
- 		return 0;
+ 		return ret == -EBUSY ? -ENOSPC : ret;
  	}
  
 -	ttm_bo_del_from_lru(bo);
 +	ttm_bo_move_to_pinned(bo);
  	/* TODO: Cleanup the locking */
  	spin_unlock(&bo->bdev->lru_lock);