diff options
author | Carlos Santa <carlos.santa@intel.com> | 2016-08-17 15:30:43 -0400 |
---|---|---|
committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2016-09-07 19:07:08 -0400 |
commit | 53233f084d3a756875ad5097440b0faf3348869b (patch) | |
tree | 36396009c42bf46560679e06d1faff1c0bea90dc /drivers/gpu/drm | |
parent | 3bacde19993a7b8f7f2440aeaf112da81f64bb5b (diff) |
drm/i915: Move HAS_RESOURCE_STREAMER 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: 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 | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_pci.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 44e18110a279..80ca60d5ac16 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -657,6 +657,7 @@ struct intel_csr { | |||
657 | func(has_psr) sep \ | 657 | func(has_psr) sep \ |
658 | func(has_runtime_pm) sep \ | 658 | func(has_runtime_pm) sep \ |
659 | func(has_csr) sep \ | 659 | func(has_csr) sep \ |
660 | func(has_resource_streamer) sep \ | ||
660 | func(has_pipe_cxsr) sep \ | 661 | func(has_pipe_cxsr) sep \ |
661 | func(has_hotplug) sep \ | 662 | func(has_hotplug) sep \ |
662 | func(cursor_needs_physical) sep \ | 663 | func(cursor_needs_physical) sep \ |
@@ -2803,8 +2804,7 @@ struct drm_i915_cmd_table { | |||
2803 | #define HAS_GUC_UCODE(dev) (HAS_GUC(dev)) | 2804 | #define HAS_GUC_UCODE(dev) (HAS_GUC(dev)) |
2804 | #define HAS_GUC_SCHED(dev) (HAS_GUC(dev)) | 2805 | #define HAS_GUC_SCHED(dev) (HAS_GUC(dev)) |
2805 | 2806 | ||
2806 | #define HAS_RESOURCE_STREAMER(dev) (IS_HASWELL(dev) || \ | 2807 | #define HAS_RESOURCE_STREAMER(dev) (INTEL_INFO(dev)->has_resource_streamer) |
2807 | INTEL_INFO(dev)->gen >= 8) | ||
2808 | 2808 | ||
2809 | #define HAS_POOLED_EU(dev) (INTEL_INFO(dev)->has_pooled_eu) | 2809 | #define HAS_POOLED_EU(dev) (INTEL_INFO(dev)->has_pooled_eu) |
2810 | 2810 | ||
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 21a3bc50faa4..46c48eda23f6 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c | |||
@@ -260,6 +260,7 @@ static const struct intel_device_info intel_valleyview_info = { | |||
260 | .has_ddi = 1, \ | 260 | .has_ddi = 1, \ |
261 | .has_fpga_dbg = 1, \ | 261 | .has_fpga_dbg = 1, \ |
262 | .has_psr = 1, \ | 262 | .has_psr = 1, \ |
263 | .has_resource_streamer = 1, \ | ||
263 | .has_runtime_pm = 1 | 264 | .has_runtime_pm = 1 |
264 | 265 | ||
265 | static const struct intel_device_info intel_haswell_info = { | 266 | static const struct intel_device_info intel_haswell_info = { |
@@ -291,6 +292,7 @@ static const struct intel_device_info intel_cherryview_info = { | |||
291 | .is_cherryview = 1, | 292 | .is_cherryview = 1, |
292 | .has_psr = 1, | 293 | .has_psr = 1, |
293 | .has_runtime_pm = 1, | 294 | .has_runtime_pm = 1, |
295 | .has_resource_streamer = 1, | ||
294 | .display_mmio_offset = VLV_DISPLAY_BASE, | 296 | .display_mmio_offset = VLV_DISPLAY_BASE, |
295 | GEN_CHV_PIPEOFFSETS, | 297 | GEN_CHV_PIPEOFFSETS, |
296 | CURSOR_OFFSETS, | 298 | CURSOR_OFFSETS, |
@@ -324,6 +326,7 @@ static const struct intel_device_info intel_broxton_info = { | |||
324 | .has_runtime_pm = 1, | 326 | .has_runtime_pm = 1, |
325 | .has_pooled_eu = 0, | 327 | .has_pooled_eu = 0, |
326 | .has_csr = 1, | 328 | .has_csr = 1, |
329 | .has_resource_streamer = 1, | ||
327 | GEN_DEFAULT_PIPEOFFSETS, | 330 | GEN_DEFAULT_PIPEOFFSETS, |
328 | IVB_CURSOR_OFFSETS, | 331 | IVB_CURSOR_OFFSETS, |
329 | BDW_COLORS, | 332 | BDW_COLORS, |