Commit 3d6c72b7 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

Revert "drm/i915: Drop has_logical_ring_elsq from device info" 



This reverts commit b6411373.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Acked-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220519090802.1294691-5-tvrtko.ursulin@linux.intel.com
parent 9d8d5a39

drivers/gpu/drm/i915/i915_drv.h

+2 −1
Original line number Diff line number Diff line
@@ -1241,7 +1241,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, 


#define HAS_LOGICAL_RING_CONTEXTS(dev_priv) \

		(INTEL_INFO(dev_priv)->has_logical_ring_contexts)

#define HAS_LOGICAL_RING_ELSQ(dev_priv) (GRAPHICS_VER(dev_priv) >= 11)

#define HAS_LOGICAL_RING_ELSQ(dev_priv) \

		(INTEL_INFO(dev_priv)->has_logical_ring_elsq)



#define HAS_EXECLISTS(dev_priv) HAS_LOGICAL_RING_CONTEXTS(dev_priv)

drivers/gpu/drm/i915/i915_pci.c

+3 −1
Original line number Diff line number Diff line
@@ -809,7 +809,8 @@ static const struct intel_device_info cml_gt2_info = { 
	.dbuf.size = 2048, \

	.dbuf.slice_mask = BIT(DBUF_S1) | BIT(DBUF_S2), \

	.display.has_dsc = 1, \

	.has_coherent_ggtt = false

	.has_coherent_ggtt = false, \

	.has_logical_ring_elsq = 1



static const struct intel_device_info icl_info = {

	GEN11_FEATURES,
@@ -996,6 +997,7 @@ static const struct intel_device_info adl_p_info = { 
	.has_global_mocs = 1, \

	.has_llc = 1, \

	.has_logical_ring_contexts = 1, \

	.has_logical_ring_elsq = 1, \

	.has_mslices = 1, \

	.has_rps = 1, \

	.has_runtime_pm = 1, \

drivers/gpu/drm/i915/intel_device_info.h

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ enum intel_ppgtt_type { 
	func(has_l3_dpf); \

	func(has_llc); \

	func(has_logical_ring_contexts); \

	func(has_logical_ring_elsq); \

	func(has_mslices); \

	func(has_pooled_eu); \

	func(has_pxp); \