On Wed, May 04, 2022 at 12:07:51PM -0700, José Roberto de Souza wrote:
> No need to have this parameter in intel_device_info struct
> as all platforms with graphics version 11 or newer has this feature.
>
> Signed-off-by: José Roberto de Souza <jose.souza@xxxxxxxxx>
Reviewed-by: Matt Roper <matthew.d.roper@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 3 +--
> drivers/gpu/drm/i915/i915_pci.c | 4 +---
> drivers/gpu/drm/i915/intel_device_info.h | 1 -
> 3 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 602e056edd314..f23e5c5cbf82b 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1247,8 +1247,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 b47f8b1ab9c6c..25aa8f5957f1e 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -804,8 +804,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,
> @@ -989,7 +988,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 62c9616ea6a9c..7cf16b0315b54 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.h
> +++ b/drivers/gpu/drm/i915/intel_device_info.h
> @@ -151,7 +151,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); \
> --
> 2.36.0
>
--
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
