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

drm/i915: Move HAS_GMBUS_IRQ definition to platform definition

Moving all GPU features to the platform struct 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 a1323380
...@@ -661,6 +661,7 @@ struct intel_csr { ...@@ -661,6 +661,7 @@ struct intel_csr {
func(has_rc6) sep \ func(has_rc6) sep \
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_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 \
...@@ -2770,7 +2771,7 @@ struct drm_i915_cmd_table { ...@@ -2770,7 +2771,7 @@ struct drm_i915_cmd_table {
* interrupt source and so prevents the other device from working properly. * interrupt source and so prevents the other device from working properly.
*/ */
#define HAS_AUX_IRQ(dev) (INTEL_INFO(dev)->gen >= 5) #define HAS_AUX_IRQ(dev) (INTEL_INFO(dev)->gen >= 5)
#define HAS_GMBUS_IRQ(dev) (INTEL_INFO(dev)->gen >= 5) #define HAS_GMBUS_IRQ(dev) (INTEL_INFO(dev)->has_gmbus_irq)
/* With the 945 and later, Y tiling got adjusted so that it was 32 128-byte /* With the 945 and later, Y tiling got adjusted so that it was 32 128-byte
* rows, which changed the alignment requirements and fence programming. * rows, which changed the alignment requirements and fence programming.
......
...@@ -181,6 +181,7 @@ static const struct intel_device_info intel_pineview_info = { ...@@ -181,6 +181,7 @@ static const struct intel_device_info intel_pineview_info = {
#define GEN5_FEATURES \ #define GEN5_FEATURES \
.gen = 5, .num_pipes = 2, \ .gen = 5, .num_pipes = 2, \
.need_gfx_hws = 1, .has_hotplug = 1, \ .need_gfx_hws = 1, .has_hotplug = 1, \
.has_gmbus_irq = 1, \
.ring_mask = RENDER_RING | BSD_RING, \ .ring_mask = RENDER_RING | BSD_RING, \
GEN_DEFAULT_PIPEOFFSETS, \ GEN_DEFAULT_PIPEOFFSETS, \
CURSOR_OFFSETS CURSOR_OFFSETS
...@@ -202,6 +203,7 @@ static const struct intel_device_info intel_ironlake_m_info = { ...@@ -202,6 +203,7 @@ static const struct intel_device_info intel_ironlake_m_info = {
.has_llc = 1, \ .has_llc = 1, \
.has_rc6 = 1, \ .has_rc6 = 1, \
.has_rc6p = 1, \ .has_rc6p = 1, \
.has_gmbus_irq = 1, \
GEN_DEFAULT_PIPEOFFSETS, \ GEN_DEFAULT_PIPEOFFSETS, \
CURSOR_OFFSETS CURSOR_OFFSETS
...@@ -222,6 +224,7 @@ static const struct intel_device_info intel_sandybridge_m_info = { ...@@ -222,6 +224,7 @@ static const struct intel_device_info intel_sandybridge_m_info = {
.has_llc = 1, \ .has_llc = 1, \
.has_rc6 = 1, \ .has_rc6 = 1, \
.has_rc6p = 1, \ .has_rc6p = 1, \
.has_gmbus_irq = 1, \
GEN_DEFAULT_PIPEOFFSETS, \ GEN_DEFAULT_PIPEOFFSETS, \
IVB_CURSOR_OFFSETS IVB_CURSOR_OFFSETS
...@@ -247,6 +250,7 @@ static const struct intel_device_info intel_ivybridge_q_info = { ...@@ -247,6 +250,7 @@ static const struct intel_device_info intel_ivybridge_q_info = {
.has_psr = 1, \ .has_psr = 1, \
.has_runtime_pm = 1, \ .has_runtime_pm = 1, \
.has_rc6 = 1, \ .has_rc6 = 1, \
.has_gmbus_irq = 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, \
...@@ -300,6 +304,7 @@ static const struct intel_device_info intel_cherryview_info = { ...@@ -300,6 +304,7 @@ static const struct intel_device_info intel_cherryview_info = {
.has_runtime_pm = 1, .has_runtime_pm = 1,
.has_resource_streamer = 1, .has_resource_streamer = 1,
.has_rc6 = 1, .has_rc6 = 1,
.has_gmbus_irq = 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 +341,7 @@ static const struct intel_device_info intel_broxton_info = { ...@@ -336,6 +341,7 @@ static const struct intel_device_info intel_broxton_info = {
.has_resource_streamer = 1, .has_resource_streamer = 1,
.has_rc6 = 1, .has_rc6 = 1,
.has_dp_mst = 1, .has_dp_mst = 1,
.has_gmbus_irq = 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