From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Date: Wed, 15 Sep 2021 10:23:27 +0000 (+0300)
Subject: Merge drm/drm-next into drm-intel-gt-next
X-Git-Tag: howlett/maple/20220722_2~1941^2~8^2~68
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d5dd580deb54483cce0cb5bbe3f1a132a28c767d;p=users%2Fjedix%2Flinux-maple.git

Merge drm/drm-next into drm-intel-gt-next

Close the divergence which has caused patches not to apply and
have a solid baseline for the PXP patches that Rodrigo will send
a topic branch PR for.

Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
---

d5dd580deb54483cce0cb5bbe3f1a132a28c767d
diff --cc drivers/gpu/drm/i915/i915_pci.c
index 4745f7aad848,1bbd09ad5287..d1da31df276c
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@@ -909,9 -894,10 +894,10 @@@ static const struct intel_device_info r
  	.has_snoop = 1, \
  	.is_dgfx = 1
  
 -static const struct intel_device_info dg1_info __maybe_unused = {
 +static const struct intel_device_info dg1_info = {
  	GEN12_FEATURES,
  	DGFX_FEATURES,
+ 	.graphics_rel = 10,
  	PLATFORM(INTEL_DG1),
  	.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D),
  	.require_force_probe = 1,
diff --cc drivers/gpu/drm/ttm/ttm_bo_util.c
index e3747f069674,1c5ffe2935af..c893c3db2623
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@@ -166,15 -171,12 +168,14 @@@ int ttm_bo_move_memcpy(struct ttm_buffe
  		goto out_src_iter;
  	}
  
 -	ttm_move_memcpy(bo, dst_mem->num_pages, dst_iter, src_iter);
 +	clear = src_iter->ops->maps_tt && (!ttm || !ttm_tt_is_populated(ttm));
 +	if (!(clear && ttm && !(ttm->page_flags & TTM_PAGE_FLAG_ZERO_ALLOC)))
 +		ttm_move_memcpy(clear, dst_mem->num_pages, dst_iter, src_iter);
  
- 	src_copy = *src_mem;
+ 	if (!src_iter->ops->maps_tt)
+ 		ttm_kmap_iter_linear_io_fini(&_src_iter.io, bdev, src_mem);
  	ttm_bo_move_sync_cleanup(bo, dst_mem);
  
- 	if (!src_iter->ops->maps_tt)
- 		ttm_kmap_iter_linear_io_fini(&_src_iter.io, bdev, &src_copy);
  out_src_iter:
  	if (!dst_iter->ops->maps_tt)
  		ttm_kmap_iter_linear_io_fini(&_dst_iter.io, bdev, dst_mem);