Permalink
Browse files

Merge remote-tracking branch 'origin/gdev-axe'

  • Loading branch information...
2 parents 97050f3 + 94a367d commit 0c58d0c9293406624b7262743176e3067b7248f6 @shinpei0208 shinpei0208 committed Jul 17, 2013
@@ -819,8 +819,9 @@ CUresult gdev_cuda_load_cubin_image(struct CUmod_st *mod, const void *image)
#ifdef __KERNEL__
fail_load_cubin:
unload_cubin(mod);
-#endif
+#else
fail_save_ptx:
+#endif
switch (ret) {
case -ENOMEM:
return CUDA_ERROR_OUT_OF_MEMORY;
@@ -13,7 +13,10 @@ ZOMBIE = $(wildcard ./*~)
all: $(OBJS)
implementation/%.cpp:implementation/%.yy
- $(YACC) -o $@ --defines=../../$(basename $(notdir $@)).hpp $^
+ (TEMPFILE=`mktemp`; \
+ $(YACC) -o $@ --defines=$$TEMPFILE $^; \
+ cat $$TEMPFILE | sed 's/^#ifdef YYPARSE_PARAM$$/#if 0\n\0/g' | sed 's/^#endif \/\* ! YYPARSE_PARAM \*\/$$/\0\n#endif/g' > ../../$(basename $(notdir $@)).hpp; \
+ unlink $$TEMPFILE)
implementation/%.cpp:implementation/%.ll
$(LEX) -o$@ $^
@@ -406,6 +406,21 @@ int gdev_drv_getparam(struct drm_device *drm, uint32_t type, uint64_t *res)
ret = nouveau_ioctl_getparam(drm, &getparam, NULL);
*res = getparam.value;
break;
+ case GDEV_DRV_GETPARAM_BUS_TYPE:
+ getparam.param = NOUVEAU_GETPARAM_BUS_TYPE;
+ ret = nouveau_ioctl_getparam(drm, &getparam, NULL);
+ *res = getparam.value;
+ break;
+ case GDEV_DRV_GETPARAM_PCI_VENDOR:
+ getparam.param = NOUVEAU_GETPARAM_PCI_VENDOR;
+ ret = nouveau_ioctl_getparam(drm, &getparam, NULL);
+ *res = getparam.value;
+ break;
+ case GDEV_DRV_GETPARAM_PCI_DEVICE:
+ getparam.param = NOUVEAU_GETPARAM_PCI_DEVICE;
+ ret = nouveau_ioctl_getparam(drm, &getparam, NULL);
+ *res = getparam.value;
+ break;
default:
ret = -EINVAL;
}
@@ -13,6 +13,9 @@
#define GDEV_DRV_GETPARAM_FB_SIZE 2
#define GDEV_DRV_GETPARAM_AGP_SIZE 3
#define GDEV_DRV_GETPARAM_CHIPSET_ID 4
+#define GDEV_DRV_GETPARAM_BUS_TYPE 5
+#define GDEV_DRV_GETPARAM_PCI_VENDOR 6
+#define GDEV_DRV_GETPARAM_PCI_DEVICE 7
struct gdev_drv_vspace {
void *priv;
Oops, something went wrong.

0 comments on commit 0c58d0c

Please sign in to comment.