[Intel-gfx] [PATCH 13/16] drm/i915: Drop has_heci_gscfi from device info

From: "José Roberto de Souza" <jose.souza@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 13/16] drm/i915: Drop has_heci_gscfi from device info
Date: Sat,  7 May 2022 06:28:47 -0700	[thread overview]
Message-ID: <20220507132850.10272-13-jose.souza@intel.com> (raw)
In-Reply-To: <20220507132850.10272-1-jose.souza@intel.com>

No need to have this parameter in intel_device_info struct
as this feature was only supported in Ivybridge and Haswell.

As a side effect of the of removal this flag, it will not be printed
in dmesg during driver load anymore and developers will have to rely
on to check the macro and compare with platform being used and IP
versions of it.

Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h          |  2 +-
 drivers/gpu/drm/i915/i915_pci.c          | 12 ++++--------
 drivers/gpu/drm/i915/intel_device_info.h |  1 -
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 1431416b7fd60..fad2bb34b47f0 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1375,7 +1375,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
 #define HAS_LSPCON(dev_priv) (IS_DISPLAY_VER(dev_priv, 9, 10))
 
 /* DPF == dynamic parity feature */
-#define HAS_L3_DPF(dev_priv) (INTEL_INFO(dev_priv)->has_l3_dpf)
+#define HAS_L3_DPF(dev_priv) (IS_HASWELL(dev_priv) || IS_IVYBRIDGE(dev_priv))
 #define NUM_L3_SLICES(dev_priv) (IS_HSW_GT3(dev_priv) ? \
 				 2 : HAS_L3_DPF(dev_priv))
 
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index e4864b0a59234..109f90b40da9b 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -460,8 +460,7 @@ static const struct intel_device_info snb_m_gt2_info = {
 
 #define IVB_D_PLATFORM \
 	GEN7_FEATURES, \
-	PLATFORM(INTEL_IVYBRIDGE), \
-	.has_l3_dpf = 1
+	PLATFORM(INTEL_IVYBRIDGE)
 
 static const struct intel_device_info ivb_d_gt1_info = {
 	IVB_D_PLATFORM,
@@ -476,8 +475,7 @@ static const struct intel_device_info ivb_d_gt2_info = {
 #define IVB_M_PLATFORM \
 	GEN7_FEATURES, \
 	PLATFORM(INTEL_IVYBRIDGE), \
-	.is_mobile = 1, \
-	.has_l3_dpf = 1
+	.is_mobile = 1
 
 static const struct intel_device_info ivb_m_gt1_info = {
 	IVB_M_PLATFORM,
@@ -494,8 +492,7 @@ static const struct intel_device_info ivb_q_info = {
 	PLATFORM(INTEL_IVYBRIDGE),
 	.gt = 2,
 	.display.pipe_mask = 0, /* legal, last one wins */
-	.display.cpu_transcoder_mask = 0,
-	.has_l3_dpf = 1,
+	.display.cpu_transcoder_mask = 0
 };
 
 static const struct intel_device_info vlv_info = {
@@ -533,8 +530,7 @@ static const struct intel_device_info vlv_info = {
 
 #define HSW_PLATFORM \
 	G75_FEATURES, \
-	PLATFORM(INTEL_HASWELL), \
-	.has_l3_dpf = 1
+	PLATFORM(INTEL_HASWELL)
 
 static const struct intel_device_info hsw_gt1_info = {
 	HSW_PLATFORM,
diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index e40ae78c4c7c9..952ececab8dba 100644
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -143,7 +143,6 @@ enum intel_ppgtt_type {
 	func(gpu_reset_clobbers_display); \
 	func(has_flat_ccs); \
 	func(has_heci_pxp); \
-	func(has_l3_dpf); \
 	func(has_logical_ring_contexts); \
 	func(has_mslices); \
 	func(has_pooled_eu); \
-- 
2.36.0

