@@ -1395,8 +1395,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
#define INTEL_DISPLAY_ENABLED(dev_priv) \
(drm_WARN_ON(&(dev_priv)->drm, !HAS_DISPLAY(dev_priv)), !(dev_priv)->params.disable_display)
-#define HAS_GUC_DEPRIVILEGE(dev_priv) \
- (INTEL_INFO(dev_priv)->has_guc_deprivilege)
+#define HAS_GUC_DEPRIVILEGE(dev_priv) (GRAPHICS_VER_FULL(dev_priv) >= IP_VER(12, 55))
#define HAS_PERCTX_PREEMPT_CTRL(i915) \
((GRAPHICS_VER(i915) >= 9) && GRAPHICS_VER_FULL(i915) < IP_VER(12, 55))
@@ -996,7 +996,6 @@ static const struct intel_device_info xehpsdv_info = {
.media.rel = 55, \
PLATFORM(INTEL_DG2), \
.has_64k_pages = 1, \
- .has_guc_deprivilege = 1, \
.has_heci_pxp = 1, \
.needs_compact_pt = 1, \
.platform_engine_mask = \
@@ -144,7 +144,6 @@ enum intel_ppgtt_type {
func(has_flat_ccs); \
func(has_heci_pxp); \
func(has_heci_gscfi); \
- func(has_guc_deprivilege); \
func(has_l3_dpf); \
func(has_logical_ring_contexts); \
func(has_mslices); \
No need to have this parameter in intel_device_info struct as all platforms with graphics version 12.55 or newer has this feature. 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 | 3 +-- drivers/gpu/drm/i915/i915_pci.c | 1 - drivers/gpu/drm/i915/intel_device_info.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-)