aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_pci.c
diff options
context:
space:
mode:
authorCarlos Santa <carlos.santa@intel.com>2016-08-17 15:30:36 -0400
committerRodrigo Vivi <rodrigo.vivi@intel.com>2016-09-07 19:07:07 -0400
commit6e3b84d831113804fcae3646b99816556915b881 (patch)
tree723a516b437beb6dff73e377803aadfedf9e759f /drivers/gpu/drm/i915/i915_pci.c
parent81b9fd8fc68e9e0999efc604c4e5477b8d1982aa (diff)
drm/i915: Move HAS_PSR definition to platform struct definition
[patch series] 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 definition 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/i915/i915_pci.c')
-rw-r--r--drivers/gpu/drm/i915/i915_pci.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 2587b1bd41f4..e1caa0b63f3b 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -243,6 +243,7 @@ static const struct intel_device_info intel_ivybridge_q_info = {
243 243
244#define VLV_FEATURES \ 244#define VLV_FEATURES \
245 .gen = 7, .num_pipes = 2, \ 245 .gen = 7, .num_pipes = 2, \
246 .has_psr = 1, \
246 .need_gfx_hws = 1, .has_hotplug = 1, \ 247 .need_gfx_hws = 1, .has_hotplug = 1, \
247 .ring_mask = RENDER_RING | BSD_RING | BLT_RING, \ 248 .ring_mask = RENDER_RING | BSD_RING | BLT_RING, \
248 .display_mmio_offset = VLV_DISPLAY_BASE, \ 249 .display_mmio_offset = VLV_DISPLAY_BASE, \
@@ -264,7 +265,8 @@ static const struct intel_device_info intel_valleyview_d_info = {
264 GEN7_FEATURES, \ 265 GEN7_FEATURES, \
265 .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, \ 266 .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, \
266 .has_ddi = 1, \ 267 .has_ddi = 1, \
267 .has_fpga_dbg = 1 268 .has_fpga_dbg = 1, \
269 .has_psr = 1
268 270
269static const struct intel_device_info intel_haswell_d_info = { 271static const struct intel_device_info intel_haswell_d_info = {
270 HSW_FEATURES, 272 HSW_FEATURES,
@@ -312,6 +314,7 @@ static const struct intel_device_info intel_cherryview_info = {
312 .need_gfx_hws = 1, .has_hotplug = 1, 314 .need_gfx_hws = 1, .has_hotplug = 1,
313 .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, 315 .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING,
314 .is_cherryview = 1, 316 .is_cherryview = 1,
317 .has_psr = 1,
315 .display_mmio_offset = VLV_DISPLAY_BASE, 318 .display_mmio_offset = VLV_DISPLAY_BASE,
316 GEN_CHV_PIPEOFFSETS, 319 GEN_CHV_PIPEOFFSETS,
317 CURSOR_OFFSETS, 320 CURSOR_OFFSETS,