[Intel-gfx] [PATCH 21/23] drm/i915: Move HAS_LOGICAL_RING_CONTEXTS definition to platform definition

[Rodrigo Vivi]

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

On Wed, Jul 20, 2016 at 10:40 AM, Carlos Santa <carlos.santa at intel.com> wrote:
> Moving all GPU features to the platform definition allows for
>         - standard place when adding new features from new platforms
>         - possible to see supported features when dumping struct
>           definitions
>
> Signed-off-by: Carlos Santa <carlos.santa at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.h | 3 ++-
>  drivers/gpu/drm/i915/i915_pci.c | 5 ++++-
>  2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 06d2850..8f93a93 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -782,6 +782,7 @@ struct intel_csr {
>         func(has_gmbus_irq) sep \
>         func(has_fw_blc) sep \
>         func(has_hw_contexts) sep \
> +       func(has_logical_ring_contexts) sep \
>         func(has_resource_streamer) sep \
>         func(has_pipe_cxsr) sep \
>         func(has_hotplug) sep \
> @@ -2816,7 +2817,7 @@ struct drm_i915_cmd_table {
>  #define I915_NEED_GFX_HWS(dev) (INTEL_INFO(dev)->need_gfx_hws)
>
>  #define HAS_HW_CONTEXTS(dev)   (INTEL_INFO(dev)->has_hw_contexts)
> -#define HAS_LOGICAL_RING_CONTEXTS(dev) (INTEL_INFO(dev)->gen >= 8)
> +#define HAS_LOGICAL_RING_CONTEXTS(dev) (INTEL_INFO(dev)->has_logical_ring_contexts)
>  #define USES_PPGTT(dev)                (i915.enable_ppgtt)
>  #define USES_FULL_PPGTT(dev)   (i915.enable_ppgtt >= 2)
>  #define USES_FULL_48BIT_PPGTT(dev)     (i915.enable_ppgtt == 3)
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index 26ff54e..d90cb47 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -311,7 +311,8 @@ static const struct intel_device_info intel_haswell_m_info = {
>
>  #define BDW_FEATURES \
>         HSW_FEATURES, \
> -       BDW_COLORS
> +       BDW_COLORS, \
> +       .has_logical_ring_contexts = 1
>
>  static const struct intel_device_info intel_broadwell_d_info = {
>         BDW_FEATURES,
> @@ -353,6 +354,7 @@ static const struct intel_device_info intel_cherryview_info = {
>         .has_gmbus_irq = 1,
>         .has_fw_blc = 1,
>         .has_hw_contexts = 1,
> +       .has_logical_ring_contexts = 1,
>         .display_mmio_offset = VLV_DISPLAY_BASE,
>         GEN_CHV_PIPEOFFSETS,
>         CURSOR_OFFSETS,
> @@ -396,6 +398,7 @@ static const struct intel_device_info intel_broxton_info = {
>         .has_gmbus_irq = 1,
>         .has_fw_blc = 1,
>         .has_hw_contexts = 1,
> +       .has_logical_ring_contexts = 1,
>         GEN_DEFAULT_PIPEOFFSETS,
>         IVB_CURSOR_OFFSETS,
>         BDW_COLORS,
> --
> 1.9.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Rodrigo Vivi
Blog: http://blog.vivi.eng.br