drm/i915: Drop has_logical_ring_elsq from device info

No need to have this parameter in intel_device_info struct
as all platforms with graphics version 11 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.

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220505193524.276400-4-jose.souza@intel.com

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 8f48c3d906455815ee639ea4698e637714382982..bc6d8ccd662ee7938e4057876a9a58efa0473ffc 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1241,8 +1241,7 @@ 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) \
-               (INTEL_INFO(dev_priv)->has_logical_ring_elsq)
+#define HAS_LOGICAL_RING_ELSQ(dev_priv) (GRAPHICS_VER(dev_priv) >= 11)
 
 #define HAS_EXECLISTS(dev_priv) HAS_LOGICAL_RING_CONTEXTS(dev_priv)
 

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index b86e67c69458466e2f983157b756a806d24ac46e..f60f9babdf2a942fe484e7a436de1cf13cb44c49 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -809,8 +809,7 @@ 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_logical_ring_elsq = 1
+       .has_coherent_ggtt = false
 
 static const struct intel_device_info icl_info = {
        GEN11_FEATURES,
@@ -997,7 +996,6 @@ 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, \

diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index 53777e14fa850ba39d68fd9bae8a90d90c9495e4..1308752219db6ed526959207722d47b036fc1cc2 100644 (file)
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -146,7 +146,6 @@ 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); \