Commit b409db08 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

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



This reverts commit 922abe4d.

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-6-tvrtko.ursulin@linux.intel.com
parent 3d6c72b7

drivers/gpu/drm/i915/gt/intel_reset.c

+1 −1
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ bool intel_has_reset_engine(const struct intel_gt *gt) 
	if (gt->i915->params.reset < 2)

		return false;



	return GRAPHICS_VER(gt->i915) >= 7;

	return INTEL_INFO(gt->i915)->has_reset_engine;

}



int intel_reset_guc(struct intel_gt *gt)

drivers/gpu/drm/i915/i915_pci.c

+5 −0
Original line number Diff line number Diff line
@@ -456,6 +456,7 @@ static const struct intel_device_info snb_m_gt2_info = { 
	.has_coherent_ggtt = true, \

	.has_llc = 1, \

	.has_rc6p = 1, \

	.has_reset_engine = true, \

	.has_rps = true, \

	.dma_mask_size = 40, \

	.ppgtt_type = INTEL_PPGTT_ALIASING, \
@@ -513,6 +514,7 @@ static const struct intel_device_info vlv_info = { 
	.display.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B),

	.display.cpu_transcoder_mask = BIT(TRANSCODER_A) | BIT(TRANSCODER_B),

	.has_runtime_pm = 1,

	.has_reset_engine = true,

	.has_rps = true,

	.display.has_gmch = 1,

	.display.has_hotplug = 1,
@@ -616,6 +618,7 @@ static const struct intel_device_info chv_info = { 
	.dma_mask_size = 39,

	.ppgtt_type = INTEL_PPGTT_FULL,

	.ppgtt_size = 32,

	.has_reset_engine = 1,

	.has_snoop = true,

	.has_coherent_ggtt = false,

	.display_mmio_offset = VLV_DISPLAY_BASE,
@@ -697,6 +700,7 @@ static const struct intel_device_info skl_gt4_info = { 
	.dma_mask_size = 39, \

	.ppgtt_type = INTEL_PPGTT_FULL, \

	.ppgtt_size = 48, \

	.has_reset_engine = 1, \

	.has_snoop = true, \

	.has_coherent_ggtt = false, \

	.display.has_ipc = 1, \
@@ -999,6 +1003,7 @@ static const struct intel_device_info adl_p_info = { 
	.has_logical_ring_contexts = 1, \

	.has_logical_ring_elsq = 1, \

	.has_mslices = 1, \

	.has_reset_engine = 1, \

	.has_rps = 1, \

	.has_runtime_pm = 1, \

	.ppgtt_size = 48, \

drivers/gpu/drm/i915/intel_device_info.h

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ enum intel_ppgtt_type { 
	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); \