diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-19 13:01:15 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-19 13:01:15 +0000 |
| commit | 0184bb1c6d946bcaf198f7680b3405adca676790 (patch) | |
| tree | da522808dae925cb17ff7f84aba61f83aa5c7569 /intel | |
| parent | 760c01a6af12c013bca0ad1f17c793ca813be4cc (diff) | |
intel: Export CONSTANT_BUFFER addressing mode
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'intel')
| -rw-r--r-- | intel/intel_bufmgr.c | 4 | ||||
| -rw-r--r-- | intel/intel_bufmgr.h | 2 | ||||
| -rw-r--r-- | intel/intel_bufmgr_gem.c | 6 | ||||
| -rw-r--r-- | intel/intel_bufmgr_priv.h | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/intel/intel_bufmgr.c b/intel/intel_bufmgr.c index f93a8707..b7c5c091 100644 --- a/intel/intel_bufmgr.c +++ b/intel/intel_bufmgr.c @@ -136,12 +136,12 @@ drm_intel_bo_exec(drm_intel_bo *bo, int used, int drm_intel_bo_mrb_exec(drm_intel_bo *bo, int used, drm_clip_rect_t *cliprects, int num_cliprects, int DR4, - int ring_flag) + unsigned int rings) { if (bo->bufmgr->bo_mrb_exec) return bo->bufmgr->bo_mrb_exec(bo, used, cliprects, num_cliprects, DR4, - ring_flag); + rings); return -ENODEV; } diff --git a/intel/intel_bufmgr.h b/intel/intel_bufmgr.h index e1b4c454..daa18b4c 100644 --- a/intel/intel_bufmgr.h +++ b/intel/intel_bufmgr.h @@ -114,7 +114,7 @@ int drm_intel_bo_exec(drm_intel_bo *bo, int used, struct drm_clip_rect *cliprects, int num_cliprects, int DR4); int drm_intel_bo_mrb_exec(drm_intel_bo *bo, int used, struct drm_clip_rect *cliprects, int num_cliprects, int DR4, - int ring_flag); + unsigned int flags); int drm_intel_bufmgr_check_aperture_space(drm_intel_bo ** bo_array, int count); int drm_intel_bo_emit_reloc(drm_intel_bo *bo, uint32_t offset, diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c index c5bb5885..72c8731f 100644 --- a/intel/intel_bufmgr_gem.c +++ b/intel/intel_bufmgr_gem.c @@ -1555,13 +1555,13 @@ drm_intel_gem_bo_exec(drm_intel_bo *bo, int used, static int drm_intel_gem_bo_mrb_exec2(drm_intel_bo *bo, int used, drm_clip_rect_t *cliprects, int num_cliprects, int DR4, - int ring_flag) + unsigned int flags) { drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *)bo->bufmgr; struct drm_i915_gem_execbuffer2 execbuf; int ret, i; - switch (ring_flag) { + switch (flags & 0x7) { default: return -EINVAL; case I915_EXEC_BLT: @@ -1594,7 +1594,7 @@ drm_intel_gem_bo_mrb_exec2(drm_intel_bo *bo, int used, execbuf.num_cliprects = num_cliprects; execbuf.DR1 = 0; execbuf.DR4 = DR4; - execbuf.flags = ring_flag; + execbuf.flags = flags; execbuf.rsvd1 = 0; execbuf.rsvd2 = 0; diff --git a/intel/intel_bufmgr_priv.h b/intel/intel_bufmgr_priv.h index 87e91e7f..0b625200 100644 --- a/intel/intel_bufmgr_priv.h +++ b/intel/intel_bufmgr_priv.h @@ -177,8 +177,8 @@ struct _drm_intel_bufmgr { * ring buffer */ int (*bo_mrb_exec) (drm_intel_bo *bo, int used, - drm_clip_rect_t *cliprects, int num_cliprects, - int DR4, int ring_flag); + drm_clip_rect_t *cliprects, int num_cliprects, + int DR4, unsigned flags); /** * Pin a buffer to the aperture and fix the offset until unpinned |