flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-10 01:16:18 +00:00
Code Issues Releases Wiki Activity

satisfy danvet's OC

Browse Source 
and add skip codes, but mostly satisfy danvet's OCD
This commit is contained in:
Maarten Lankhorst 2012-08-14 18:25:50 +02:00
parent 4520025b73
commit fc54f2eaa8
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/.gitignore vendored
View File

@ -69,10 +69,10 @@ gen3_render_tiledy_blits
getclient getclient
getstats getstats
getversion getversion
prime_api prime_nv_api
prime_pcopy prime_nv_pcopy
prime_nv_test
prime_self_import prime_self_import
prime_test
testdisplay testdisplay
sysfs_rc6_residency sysfs_rc6_residency
# Please keep sorted alphabetically # Please keep sorted alphabetically

18
tests/Makefile.am
View File

@ -70,9 +70,9 @@ TESTS_progs = \
gem_ctx_bad_exec \ gem_ctx_bad_exec \
gem_ctx_basic \ gem_ctx_basic \
gem_reg_read \ gem_reg_read \
prime_api \ prime_nv_api \
prime_pcopy \ prime_nv_pcopy \
prime_test \ prime_nv_test \
prime_self_import \ prime_self_import \
$(NULL) $(NULL)
@ -134,9 +134,9 @@ gem_wait_render_timeout_LDADD = $(LDADD) -lrt
gem_ctx_basic_LDADD = $(LDADD) -lpthread gem_ctx_basic_LDADD = $(LDADD) -lpthread
prime_test_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS) prime_nv_test_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS)
prime_test_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS) prime_nv_test_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS)
prime_api_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS) prime_nv_api_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS)
prime_api_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS) prime_nv_api_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS)
prime_pcopy_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS) prime_nv_pcopy_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS)
prime_pcopy_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS) prime_nv_pcopy_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS)

6
tests/prime_api.c → tests/prime_nv_api.c
View File

@ -319,7 +319,7 @@ int main(int argc, char **argv)
if (nouveau_fd == -1 || intel_fd == -1 || nouveau_fd2 == -1 || intel_fd2 == -1) { if (nouveau_fd == -1 || intel_fd == -1 || nouveau_fd2 == -1 || intel_fd2 == -1) {
fprintf(stderr,"failed to find intel and nouveau GPU\n"); fprintf(stderr,"failed to find intel and nouveau GPU\n");
return -1; return 77;
} }
/* set up intel bufmgr */ /* set up intel bufmgr */
@ -333,7 +333,7 @@ int main(int argc, char **argv)
ret = nouveau_device_wrap(nouveau_fd, 0, &ndev); ret = nouveau_device_wrap(nouveau_fd, 0, &ndev);
if (ret < 0) { if (ret < 0) {
fprintf(stderr,"failed to wrap nouveau device\n"); fprintf(stderr,"failed to wrap nouveau device\n");
return -1; return 77;
} }
ret = nouveau_client_new(ndev, &nclient); ret = nouveau_client_new(ndev, &nclient);
@ -346,7 +346,7 @@ int main(int argc, char **argv)
ret = nouveau_device_wrap(nouveau_fd2, 0, &ndev2); ret = nouveau_device_wrap(nouveau_fd2, 0, &ndev2);
if (ret < 0) { if (ret < 0) {
fprintf(stderr,"failed to wrap nouveau device\n"); fprintf(stderr,"failed to wrap nouveau device\n");
return -1; return 77;
} }
ret = nouveau_client_new(ndev2, &nclient2); ret = nouveau_client_new(ndev2, &nclient2);

6
tests/prime_pcopy.c → tests/prime_nv_pcopy.c
View File

@ -1278,9 +1278,9 @@ int main(int argc, char **argv)
if (ret < 0) if (ret < 0)
return ret; return ret;
if (nouveau_fd == -1 && intel_fd == -1) { if (nouveau_fd == -1 || intel_fd == -1) {
fprintf(stderr,"failed to find intel and nouveau GPU\n"); fprintf(stderr,"failed to find intel and nouveau GPU\n");
return -1; return 77;
} }
/* set up intel bufmgr */ /* set up intel bufmgr */
@ -1290,7 +1290,7 @@ int main(int argc, char **argv)
/* set up nouveau bufmgr */ /* set up nouveau bufmgr */
ret = init_nouveau(); ret = init_nouveau();
if (ret < 0) if (ret < 0)
return ret; return 77;
/* set up an intel batch buffer */ /* set up an intel batch buffer */
devid = intel_get_drm_devid(intel_fd); devid = intel_get_drm_devid(intel_fd);

6
tests/prime_test.c → tests/prime_nv_test.c
View File

@ -508,9 +508,9 @@ int main(int argc, char **argv)
if (ret < 0) if (ret < 0)
return ret; return ret;
if (nouveau_fd == -1 && intel_fd == -1) { if (nouveau_fd == -1 || intel_fd == -1) {
fprintf(stderr,"failed to find intel and nouveau GPU\n"); fprintf(stderr,"failed to find intel and nouveau GPU\n");
return -1; return 77;
} }
/* set up intel bufmgr */ /* set up intel bufmgr */
@ -521,7 +521,7 @@ int main(int argc, char **argv)
ret = nouveau_device_wrap(nouveau_fd, 0, &ndev); ret = nouveau_device_wrap(nouveau_fd, 0, &ndev);
if (ret < 0) { if (ret < 0) {
fprintf(stderr,"failed to wrap nouveau device\n"); fprintf(stderr,"failed to wrap nouveau device\n");
return -1; return 77;
} }
ret = nouveau_client_new(ndev, &nclient); ret = nouveau_client_new(ndev, &nclient);