diff options
author | Carlos Santa <carlos.santa@intel.com> | 2016-08-17 15:30:54 -0400 |
---|---|---|
committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2016-09-07 19:07:09 -0400 |
commit | ca9c4523882bb0ce86b4adb2b5ee4f29d2f0fc5b (patch) | |
tree | eb80383217525ea8aa35d3c07e4a9366607d7bd0 /drivers/gpu/drm | |
parent | 4586f1d067c73e1865d6e1af251fabe5334265cd (diff) |
drm/i915: Move HAS_L3_DPF definition to platform definition
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@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_pci.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 431ddf08bc0a..112e378d1937 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -664,6 +664,7 @@ struct intel_csr { | |||
664 | func(has_gmbus_irq) sep \ | 664 | func(has_gmbus_irq) sep \ |
665 | func(has_hw_contexts) sep \ | 665 | func(has_hw_contexts) sep \ |
666 | func(has_logical_ring_contexts) sep \ | 666 | func(has_logical_ring_contexts) sep \ |
667 | func(has_l3_dpf) sep \ | ||
667 | func(has_pipe_cxsr) sep \ | 668 | func(has_pipe_cxsr) sep \ |
668 | func(has_hotplug) sep \ | 669 | func(has_hotplug) sep \ |
669 | func(cursor_needs_physical) sep \ | 670 | func(cursor_needs_physical) sep \ |
@@ -2841,7 +2842,7 @@ struct drm_i915_cmd_table { | |||
2841 | IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) | 2842 | IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) |
2842 | 2843 | ||
2843 | /* DPF == dynamic parity feature */ | 2844 | /* DPF == dynamic parity feature */ |
2844 | #define HAS_L3_DPF(dev) (IS_IVYBRIDGE(dev) || IS_HASWELL(dev)) | 2845 | #define HAS_L3_DPF(dev) (INTEL_INFO(dev)->has_l3_dpf) |
2845 | #define NUM_L3_SLICES(dev) (IS_HSW_GT3(dev) ? 2 : HAS_L3_DPF(dev)) | 2846 | #define NUM_L3_SLICES(dev) (IS_HSW_GT3(dev) ? 2 : HAS_L3_DPF(dev)) |
2846 | 2847 | ||
2847 | #define GT_FREQUENCY_MULTIPLIER 50 | 2848 | #define GT_FREQUENCY_MULTIPLIER 50 |
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index dc167b0e0b74..e192df929dde 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c | |||
@@ -222,18 +222,21 @@ static const struct intel_device_info intel_sandybridge_m_info = { | |||
222 | static const struct intel_device_info intel_ivybridge_d_info = { | 222 | static const struct intel_device_info intel_ivybridge_d_info = { |
223 | GEN7_FEATURES, | 223 | GEN7_FEATURES, |
224 | .is_ivybridge = 1, | 224 | .is_ivybridge = 1, |
225 | .has_l3_dpf = 1, | ||
225 | }; | 226 | }; |
226 | 227 | ||
227 | static const struct intel_device_info intel_ivybridge_m_info = { | 228 | static const struct intel_device_info intel_ivybridge_m_info = { |
228 | GEN7_FEATURES, | 229 | GEN7_FEATURES, |
229 | .is_ivybridge = 1, | 230 | .is_ivybridge = 1, |
230 | .is_mobile = 1, | 231 | .is_mobile = 1, |
232 | .has_l3_dpf = 1, | ||
231 | }; | 233 | }; |
232 | 234 | ||
233 | static const struct intel_device_info intel_ivybridge_q_info = { | 235 | static const struct intel_device_info intel_ivybridge_q_info = { |
234 | GEN7_FEATURES, | 236 | GEN7_FEATURES, |
235 | .is_ivybridge = 1, | 237 | .is_ivybridge = 1, |
236 | .num_pipes = 0, /* legal, last one wins */ | 238 | .num_pipes = 0, /* legal, last one wins */ |
239 | .has_l3_dpf = 1, | ||
237 | }; | 240 | }; |
238 | 241 | ||
239 | #define VLV_FEATURES \ | 242 | #define VLV_FEATURES \ |
@@ -268,6 +271,7 @@ static const struct intel_device_info intel_valleyview_info = { | |||
268 | static const struct intel_device_info intel_haswell_info = { | 271 | static const struct intel_device_info intel_haswell_info = { |
269 | HSW_FEATURES, | 272 | HSW_FEATURES, |
270 | .is_haswell = 1, | 273 | .is_haswell = 1, |
274 | .has_l3_dpf = 1, | ||
271 | }; | 275 | }; |
272 | 276 | ||
273 | #define BDW_FEATURES \ | 277 | #define BDW_FEATURES \ |