diff options
| author | Dmitry Torokhov <[email protected]> | 2023-08-30 16:06:38 -0700 | 
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2023-08-30 16:06:38 -0700 | 
| commit | 1ac731c529cd4d6adbce134754b51ff7d822b145 (patch) | |
| tree | 143ab3f35ca5f3b69f583c84e6964b17139c2ec1 /drivers/gpu/drm/i915/intel_device_info.h | |
| parent | 07b4c950f27bef0362dc6ad7ee713aab61d58149 (diff) | |
| parent | 54116d442e001e1b6bd482122043b1870998a1f3 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 6.6 merge window.
Diffstat (limited to 'drivers/gpu/drm/i915/intel_device_info.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_device_info.h | 3 | 
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h index 80bda653d61b..080a4557899b 100644 --- a/drivers/gpu/drm/i915/intel_device_info.h +++ b/drivers/gpu/drm/i915/intel_device_info.h @@ -127,6 +127,7 @@ enum intel_platform {   * bit set   */  #define INTEL_SUBPLATFORM_N    1 +#define INTEL_SUBPLATFORM_RPLU  2  /* MTL */  #define INTEL_SUBPLATFORM_M	0 @@ -166,6 +167,7 @@ enum intel_ppgtt_type {  	func(has_mslice_steering); \  	func(has_oa_bpc_reporting); \  	func(has_oa_slice_contrib_limits); \ +	func(has_oam); \  	func(has_one_eu_per_fuse_bit); \  	func(has_pxp); \  	func(has_rc6); \ @@ -191,7 +193,6 @@ enum intel_ppgtt_type {  	func(has_hotplug); \  	func(has_hti); \  	func(has_ipc); \ -	func(has_modular_fia); \  	func(has_overlay); \  	func(has_psr); \  	func(has_psr_hw_tracking); \  |