aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiang, Haihao <haihao.xiang@intel.com>2013-05-28 22:22:22 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-05-31 14:54:11 -0400
commitf72a1183b31cd1bebf926f904c1f025a90d153a1 (patch)
tree1f0c569efe3738c22327c8507254041a488e8658
parentea251324cac6c1e0402db073e5193f33aedd94f3 (diff)
drm/i915: add HAS_VEBOX
The flag will be useful to help share code between IVB, and HSW as the programming is similar in many places with this as one of the major differences. Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com> [Commit message + small fix by] Reviewed-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c2
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index af224501b4ec..a4e8f16a38e8 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -311,6 +311,7 @@ static const struct intel_device_info intel_haswell_d_info = {
311 .is_haswell = 1, 311 .is_haswell = 1,
312 .has_ddi = 1, 312 .has_ddi = 1,
313 .has_fpga_dbg = 1, 313 .has_fpga_dbg = 1,
314 .has_vebox_ring = 1,
314}; 315};
315 316
316static const struct intel_device_info intel_haswell_m_info = { 317static const struct intel_device_info intel_haswell_m_info = {
@@ -320,6 +321,7 @@ static const struct intel_device_info intel_haswell_m_info = {
320 .has_ddi = 1, 321 .has_ddi = 1,
321 .has_fpga_dbg = 1, 322 .has_fpga_dbg = 1,
322 .has_fbc = 1, 323 .has_fbc = 1,
324 .has_vebox_ring = 1,
323}; 325};
324 326
325static const struct pci_device_id pciidlist[] = { /* aka */ 327static const struct pci_device_id pciidlist[] = { /* aka */
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index e417049ea581..a18da3c6c96e 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -374,6 +374,7 @@ struct drm_i915_gt_funcs {
374 func(supports_tv) sep \ 374 func(supports_tv) sep \
375 func(has_bsd_ring) sep \ 375 func(has_bsd_ring) sep \
376 func(has_blt_ring) sep \ 376 func(has_blt_ring) sep \
377 func(has_vebox_ring) sep \
377 func(has_llc) sep \ 378 func(has_llc) sep \
378 func(has_ddi) sep \ 379 func(has_ddi) sep \
379 func(has_fpga_dbg) 380 func(has_fpga_dbg)
@@ -1373,6 +1374,7 @@ struct drm_i915_file_private {
1373 1374
1374#define HAS_BSD(dev) (INTEL_INFO(dev)->has_bsd_ring) 1375#define HAS_BSD(dev) (INTEL_INFO(dev)->has_bsd_ring)
1375#define HAS_BLT(dev) (INTEL_INFO(dev)->has_blt_ring) 1376#define HAS_BLT(dev) (INTEL_INFO(dev)->has_blt_ring)
1377#define HAS_VEBOX(dev) (INTEL_INFO(dev)->has_vebox_ring)
1376#define HAS_LLC(dev) (INTEL_INFO(dev)->has_llc) 1378#define HAS_LLC(dev) (INTEL_INFO(dev)->has_llc)
1377#define I915_NEED_GFX_HWS(dev) (INTEL_INFO(dev)->need_gfx_hws) 1379#define I915_NEED_GFX_HWS(dev) (INTEL_INFO(dev)->need_gfx_hws)
1378 1380