flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-11-04 12:07:12 +00:00
Code Issues Releases Wiki Activity

context: update for new execbuf2 element

Browse Source 
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
This commit is contained in:
Ben Widawsky 2012-03-18 18:42:44 -07:00
parent b28a399dcd
commit 5a28ef8580
12 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/drmtest.c
View File

@ -118,7 +118,7 @@ void gem_quiescent_gpu(int fd)
execbuf.DR1 = 0; execbuf.DR1 = 0;
execbuf.DR4 = 0; execbuf.DR4 = 0;
execbuf.flags = 0; execbuf.flags = 0;
execbuf.rsvd1 = 0; i915_execbuffer2_set_context_id(execbuf, 0);
execbuf.rsvd2 = 0; execbuf.rsvd2 = 0;
do_ioctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &execbuf); do_ioctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &execbuf);

7
lib/intel_batchbuffer.h
View File

@ -100,4 +100,11 @@ void intel_copy_bo(struct intel_batchbuffer *batch,
drm_intel_bo *dst_bo, drm_intel_bo *src_bo, drm_intel_bo *dst_bo, drm_intel_bo *src_bo,
int width, int height); int width, int height);
#define I915_EXEC_CONTEXT_ID_MASK (0xffffffff)
#define i915_execbuffer2_set_context_id(eb2, context) \
(eb2).rsvd1 = context & I915_EXEC_CONTEXT_ID_MASK
#define i915_execbuffer2_get_context_id(eb2) \
((eb2).rsvd1 & I915_EXEC_CONTEXT_ID_MASK)
#endif #endif

2
tests/gem_bad_length.c
View File

@ -107,7 +107,7 @@ static void exec0(int fd)
execbuf.DR1 = 0; execbuf.DR1 = 0;
execbuf.DR4 = 0; execbuf.DR4 = 0;
execbuf.flags = 0; execbuf.flags = 0;
execbuf.rsvd1 = 0; i915_execbuffer2_set_context_id(execbuf, 0);
execbuf.rsvd2 = 0; execbuf.rsvd2 = 0;
printf("trying to run an empty batchbuffer\n"); printf("trying to run an empty batchbuffer\n");

2
tests/gem_exec_blt.c
View File

@ -224,7 +224,7 @@ static void run(int object_size)
execbuf.DR1 = 0; execbuf.DR1 = 0;
execbuf.DR4 = 0; execbuf.DR4 = 0;
execbuf.flags = ring; execbuf.flags = ring;
execbuf.rsvd1 = 0; i915_execbuffer2_set_context_id(execbuf, 0);
execbuf.rsvd2 = 0; execbuf.rsvd2 = 0;
for (count = 1; count <= 1<<17; count <<= 1) { for (count = 1; count <= 1<<17; count <<= 1) {

2
tests/gem_exec_faulting_reloc.c
View File

@ -207,7 +207,7 @@ static void run(int object_size)
execbuf.DR1 = 0; execbuf.DR1 = 0;
execbuf.DR4 = 0; execbuf.DR4 = 0;
execbuf.flags = ring; execbuf.flags = ring;
execbuf.rsvd1 = 0; i915_execbuffer2_set_context_id(execbuf, 0);
execbuf.rsvd2 = 0; execbuf.rsvd2 = 0;
gem_exec(fd, &execbuf); gem_exec(fd, &execbuf);

2
tests/gem_exec_nop.c
View File

@ -75,7 +75,7 @@ static int exec(int fd, uint32_t handle, int loops)
execbuf.DR1 = 0; execbuf.DR1 = 0;
execbuf.DR4 = 0; execbuf.DR4 = 0;
execbuf.flags = 0; execbuf.flags = 0;
execbuf.rsvd1 = 0; i915_execbuffer2_set_context_id(execbuf, 0);
execbuf.rsvd2 = 0; execbuf.rsvd2 = 0;
while (loops-- && ret == 0) { while (loops-- && ret == 0) {

3
tests/gem_linear_blits.c
View File

@ -130,7 +130,8 @@ copy(int fd, uint32_t dst, uint32_t src)
exec.num_cliprects = 0; exec.num_cliprects = 0;
exec.cliprects_ptr = 0; exec.cliprects_ptr = 0;
exec.flags = HAS_BLT_RING(intel_get_drm_devid(fd)) ? I915_EXEC_BLT : 0; exec.flags = HAS_BLT_RING(intel_get_drm_devid(fd)) ? I915_EXEC_BLT : 0;
exec.rsvd1 = exec.rsvd2 = 0; i915_execbuffer2_set_context_id(exec, 0);
exec.rsvd2 = 0;
ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &exec); ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &exec);
while (ret && errno == EBUSY) { while (ret && errno == EBUSY) {

6
tests/gen3_mixed_blits.c
View File

@ -312,7 +312,8 @@ render_copy(int fd,
exec.num_cliprects = 0; exec.num_cliprects = 0;
exec.cliprects_ptr = 0; exec.cliprects_ptr = 0;
exec.flags = 0; exec.flags = 0;
exec.rsvd1 = exec.rsvd2 = 0; i915_execbuffer2_set_context_id(exec, 0);
exec.rsvd2 = 0;
ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &exec); ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &exec);
while (ret && errno == EBUSY) { while (ret && errno == EBUSY) {
@ -389,7 +390,8 @@ static void blt_copy(int fd, uint32_t dst, uint32_t src)
exec.num_cliprects = 0; exec.num_cliprects = 0;
exec.cliprects_ptr = 0; exec.cliprects_ptr = 0;
exec.flags = 0; exec.flags = 0;
exec.rsvd1 = exec.rsvd2 = 0; i915_execbuffer2_set_context_id(exec, 0);
exec.rsvd2 = 0;
ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &exec); ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &exec);
while (ret && errno == EBUSY) { while (ret && errno == EBUSY) {

3
tests/gen3_render_linear_blits.c
View File

@ -281,7 +281,8 @@ copy(int fd, uint32_t dst, uint32_t src)
exec.num_cliprects = 0; exec.num_cliprects = 0;
exec.cliprects_ptr = 0; exec.cliprects_ptr = 0;
exec.flags = 0; exec.flags = 0;
exec.rsvd1 = exec.rsvd2 = 0; i915_execbuffer2_set_context_id(exec, 0);
exec.rsvd2 = 0;
ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &exec); ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &exec);
while (ret && errno == EBUSY) { while (ret && errno == EBUSY) {

3
tests/gen3_render_mixed_blits.c
View File

@ -295,7 +295,8 @@ copy(int fd,
exec.num_cliprects = 0; exec.num_cliprects = 0;
exec.cliprects_ptr = 0; exec.cliprects_ptr = 0;
exec.flags = 0; exec.flags = 0;
exec.rsvd1 = exec.rsvd2 = 0; i915_execbuffer2_set_context_id(exec, 0);
exec.rsvd2 = 0;
ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &exec); ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &exec);
while (ret && errno == EBUSY) { while (ret && errno == EBUSY) {

3
tests/gen3_render_tiledx_blits.c
View File

@ -282,7 +282,8 @@ copy(int fd, uint32_t dst, uint32_t src)
exec.num_cliprects = 0; exec.num_cliprects = 0;
exec.cliprects_ptr = 0; exec.cliprects_ptr = 0;
exec.flags = 0; exec.flags = 0;
exec.rsvd1 = exec.rsvd2 = 0; i915_execbuffer2_set_context_id(exec, 0);
exec.rsvd2 = 0;
ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &exec); ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &exec);
while (ret && errno == EBUSY) { while (ret && errno == EBUSY) {

3
tests/gen3_render_tiledy_blits.c
View File

@ -282,7 +282,8 @@ copy(int fd, uint32_t dst, uint32_t src)
exec.num_cliprects = 0; exec.num_cliprects = 0;
exec.cliprects_ptr = 0; exec.cliprects_ptr = 0;
exec.flags = 0; exec.flags = 0;
exec.rsvd1 = exec.rsvd2 = 0; i915_execbuffer2_set_context_id(exec, 0);
exec.rsvd2 = 0;
ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &exec); ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &exec);
while (ret && errno == EBUSY) { while (ret && errno == EBUSY) {