From: Jani Nikula <jani.nikula@intel.com>
Date: Mon, 11 Apr 2022 13:01:56 +0000 (+0300)
Subject: Merge drm/drm-next into drm-intel-next
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=83970cd63b9f864525761137b500113ab0b49c94;p=linux.git

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

Sync up with v5.18-rc1, in particular to get 5e3094cfd9fb
("drm/i915/xehpsdv: Add has_flat_ccs to device info").

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---

83970cd63b9f864525761137b500113ab0b49c94
diff --cc drivers/gpu/drm/i915/i915_pci.c
index 8e321d300e0c,c32c0c6661c8..9e077929ed67
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@@ -1038,35 -1040,25 +1040,36 @@@ static const struct intel_device_info x
  	.require_force_probe = 1,
  };
  
 +#define DG2_FEATURES \
 +	XE_HP_FEATURES, \
 +	XE_HPM_FEATURES, \
 +	DGFX_FEATURES, \
 +	.graphics.rel = 55, \
 +	.media.rel = 55, \
 +	PLATFORM(INTEL_DG2), \
 +	.has_4tile = 1, \
 +	.has_64k_pages = 1, \
 +	.has_guc_deprivilege = 1, \
++	.needs_compact_pt = 1, \
 +	.platform_engine_mask = \
 +		BIT(RCS0) | BIT(BCS0) | \
 +		BIT(VECS0) | BIT(VECS1) | \
 +		BIT(VCS0) | BIT(VCS2)
 +
  __maybe_unused
  static const struct intel_device_info dg2_info = {
 -	XE_HP_FEATURES,
 -	XE_HPM_FEATURES,
 +	DG2_FEATURES,
  	XE_LPD_FEATURES,
 -	DGFX_FEATURES,
 -	.graphics.rel = 55,
 -	.media.rel = 55,
 -	PLATFORM(INTEL_DG2),
 -	.has_guc_deprivilege = 1,
 -	.has_64k_pages = 1,
 -	.needs_compact_pt = 1,
 -	.platform_engine_mask =
 -		BIT(RCS0) | BIT(BCS0) |
 -		BIT(VECS0) | BIT(VECS1) |
 -		BIT(VCS0) | BIT(VCS2),
 -	.require_force_probe = 1,
  	.display.cpu_transcoder_mask = BIT(TRANSCODER_A) | BIT(TRANSCODER_B) |
  			       BIT(TRANSCODER_C) | BIT(TRANSCODER_D),
 +	.require_force_probe = 1,
 +};
 +
 +__maybe_unused
 +static const struct intel_device_info ats_m_info = {
 +	DG2_FEATURES,
 +	.display = { 0 },
 +	.require_force_probe = 1,
  };
  
  #undef PLATFORM
diff --cc drivers/gpu/drm/i915/intel_device_info.h
index 8026e805ff12,291215d9da28..f9b955810593
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@@ -131,9 -134,10 +134,11 @@@ enum intel_ppgtt_type 
  	/* Keep has_* in alphabetical order */ \
  	func(has_64bit_reloc); \
  	func(has_64k_pages); \
+ 	func(needs_compact_pt); \
  	func(gpu_reset_clobbers_display); \
  	func(has_reset_engine); \
 +	func(has_4tile); \
+ 	func(has_flat_ccs); \
  	func(has_global_mocs); \
  	func(has_gt_uc); \
  	func(has_guc_deprivilege); \