Commit 4586f1d0 authored by Carlos Santa's avatar Carlos Santa Committed by Rodrigo Vivi

drm/i915: Move HAS_LOGICAL_RING_CONTEXTS definition to platform

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: default avatarCarlos Santa <carlos.santa@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent e1a52536
...@@ -663,6 +663,7 @@ struct intel_csr { ...@@ -663,6 +663,7 @@ struct intel_csr {
func(has_dp_mst) sep \ func(has_dp_mst) sep \
func(has_gmbus_irq) sep \ func(has_gmbus_irq) sep \
func(has_hw_contexts) sep \ func(has_hw_contexts) sep \
func(has_logical_ring_contexts) sep \
func(has_pipe_cxsr) sep \ func(has_pipe_cxsr) sep \
func(has_hotplug) sep \ func(has_hotplug) sep \
func(cursor_needs_physical) sep \ func(cursor_needs_physical) sep \
...@@ -2748,7 +2749,7 @@ struct drm_i915_cmd_table { ...@@ -2748,7 +2749,7 @@ struct drm_i915_cmd_table {
#define I915_NEED_GFX_HWS(dev) (INTEL_INFO(dev)->need_gfx_hws) #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_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_PPGTT(dev) (i915.enable_ppgtt)
#define USES_FULL_PPGTT(dev) (i915.enable_ppgtt >= 2) #define USES_FULL_PPGTT(dev) (i915.enable_ppgtt >= 2)
#define USES_FULL_48BIT_PPGTT(dev) (i915.enable_ppgtt == 3) #define USES_FULL_48BIT_PPGTT(dev) (i915.enable_ppgtt == 3)
......
...@@ -272,7 +272,8 @@ static const struct intel_device_info intel_haswell_info = { ...@@ -272,7 +272,8 @@ static const struct intel_device_info intel_haswell_info = {
#define BDW_FEATURES \ #define BDW_FEATURES \
HSW_FEATURES, \ HSW_FEATURES, \
BDW_COLORS BDW_COLORS, \
.has_logical_ring_contexts = 1
static const struct intel_device_info intel_broadwell_info = { static const struct intel_device_info intel_broadwell_info = {
BDW_FEATURES, BDW_FEATURES,
...@@ -298,6 +299,7 @@ static const struct intel_device_info intel_cherryview_info = { ...@@ -298,6 +299,7 @@ static const struct intel_device_info intel_cherryview_info = {
.has_rc6 = 1, .has_rc6 = 1,
.has_gmbus_irq = 1, .has_gmbus_irq = 1,
.has_hw_contexts = 1, .has_hw_contexts = 1,
.has_logical_ring_contexts = 1,
.display_mmio_offset = VLV_DISPLAY_BASE, .display_mmio_offset = VLV_DISPLAY_BASE,
GEN_CHV_PIPEOFFSETS, GEN_CHV_PIPEOFFSETS,
CURSOR_OFFSETS, CURSOR_OFFSETS,
...@@ -336,6 +338,7 @@ static const struct intel_device_info intel_broxton_info = { ...@@ -336,6 +338,7 @@ static const struct intel_device_info intel_broxton_info = {
.has_dp_mst = 1, .has_dp_mst = 1,
.has_gmbus_irq = 1, .has_gmbus_irq = 1,
.has_hw_contexts = 1, .has_hw_contexts = 1,
.has_logical_ring_contexts = 1,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
IVB_CURSOR_OFFSETS, IVB_CURSOR_OFFSETS,
BDW_COLORS, BDW_COLORS,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment