flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-20 22:36:24 +00:00
Code Issues Releases Wiki Activity

tests/prime_nv_pcopy.c: fail if nouveau_pushbuf_kick fails rather than spinning

Browse Source
This commit is contained in:
Maarten Lankhorst 2012-09-11 19:01:46 +02:00
parent 3084263782
commit 4cd21795d2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/prime_nv_pcopy.c
View File

@ -534,6 +534,7 @@ static int perform_copy(struct nouveau_bo *nvbo, const rect *dst,
uint32_t cpp = 1, exec = 0x00003000; /* QUERY|QUERY_SHORT|FORMAT */ uint32_t cpp = 1, exec = 0x00003000; /* QUERY|QUERY_SHORT|FORMAT */
uint32_t src_off = 0, dst_off = 0; uint32_t src_off = 0, dst_off = 0;
struct nouveau_pushbuf *push = npush; struct nouveau_pushbuf *push = npush;
int ret;
if (nvbi->config.nv50.tile_mode == tile_intel_y) if (nvbi->config.nv50.tile_mode == tile_intel_y)
dbg("src is y-tiled\n"); dbg("src is y-tiled\n");
@ -591,9 +592,9 @@ static int perform_copy(struct nouveau_bo *nvbo, const rect *dst,
BEGIN_NVXX(push, SUBC_COPY(0x0300), 1); BEGIN_NVXX(push, SUBC_COPY(0x0300), 1);
PUSH_DATA (push, exec); PUSH_DATA (push, exec);
nouveau_pushbuf_kick(push, push->channel); ret = nouveau_pushbuf_kick(push, push->channel);
while (*query < query_counter) { usleep(1000); } while (!ret && *query < query_counter) { usleep(1000); }
return 0; return ret;
} }
static int check1_macro(uint32_t *p, uint32_t w, uint32_t h) static int check1_macro(uint32_t *p, uint32_t w, uint32_t h)