Commit e1a52536 authored by Carlos Santa's avatar Carlos Santa Committed by Rodrigo Vivi

drm/i915: Move HAS_HW_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 0eec8dc7
...@@ -662,6 +662,7 @@ struct intel_csr { ...@@ -662,6 +662,7 @@ struct intel_csr {
func(has_rc6p) sep \ func(has_rc6p) sep \
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_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 \
...@@ -2746,7 +2747,7 @@ struct drm_i915_cmd_table { ...@@ -2746,7 +2747,7 @@ struct drm_i915_cmd_table {
HAS_EDRAM(dev)) HAS_EDRAM(dev))
#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)->gen >= 6) #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)->gen >= 8)
#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)
......
...@@ -193,6 +193,7 @@ static const struct intel_device_info intel_ironlake_m_info = { ...@@ -193,6 +193,7 @@ static const struct intel_device_info intel_ironlake_m_info = {
.has_rc6 = 1, \ .has_rc6 = 1, \
.has_rc6p = 1, \ .has_rc6p = 1, \
.has_gmbus_irq = 1, \ .has_gmbus_irq = 1, \
.has_hw_contexts = 1, \
GEN_DEFAULT_PIPEOFFSETS, \ GEN_DEFAULT_PIPEOFFSETS, \
CURSOR_OFFSETS CURSOR_OFFSETS
...@@ -214,6 +215,7 @@ static const struct intel_device_info intel_sandybridge_m_info = { ...@@ -214,6 +215,7 @@ static const struct intel_device_info intel_sandybridge_m_info = {
.has_rc6 = 1, \ .has_rc6 = 1, \
.has_rc6p = 1, \ .has_rc6p = 1, \
.has_gmbus_irq = 1, \ .has_gmbus_irq = 1, \
.has_hw_contexts = 1, \
GEN_DEFAULT_PIPEOFFSETS, \ GEN_DEFAULT_PIPEOFFSETS, \
IVB_CURSOR_OFFSETS IVB_CURSOR_OFFSETS
...@@ -240,6 +242,7 @@ static const struct intel_device_info intel_ivybridge_q_info = { ...@@ -240,6 +242,7 @@ static const struct intel_device_info intel_ivybridge_q_info = {
.has_runtime_pm = 1, \ .has_runtime_pm = 1, \
.has_rc6 = 1, \ .has_rc6 = 1, \
.has_gmbus_irq = 1, \ .has_gmbus_irq = 1, \
.has_hw_contexts = 1, \
.need_gfx_hws = 1, .has_hotplug = 1, \ .need_gfx_hws = 1, .has_hotplug = 1, \
.ring_mask = RENDER_RING | BSD_RING | BLT_RING, \ .ring_mask = RENDER_RING | BSD_RING | BLT_RING, \
.display_mmio_offset = VLV_DISPLAY_BASE, \ .display_mmio_offset = VLV_DISPLAY_BASE, \
...@@ -294,6 +297,7 @@ static const struct intel_device_info intel_cherryview_info = { ...@@ -294,6 +297,7 @@ static const struct intel_device_info intel_cherryview_info = {
.has_resource_streamer = 1, .has_resource_streamer = 1,
.has_rc6 = 1, .has_rc6 = 1,
.has_gmbus_irq = 1, .has_gmbus_irq = 1,
.has_hw_contexts = 1,
.display_mmio_offset = VLV_DISPLAY_BASE, .display_mmio_offset = VLV_DISPLAY_BASE,
GEN_CHV_PIPEOFFSETS, GEN_CHV_PIPEOFFSETS,
CURSOR_OFFSETS, CURSOR_OFFSETS,
...@@ -331,6 +335,7 @@ static const struct intel_device_info intel_broxton_info = { ...@@ -331,6 +335,7 @@ static const struct intel_device_info intel_broxton_info = {
.has_rc6 = 1, .has_rc6 = 1,
.has_dp_mst = 1, .has_dp_mst = 1,
.has_gmbus_irq = 1, .has_gmbus_irq = 1,
.has_hw_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