geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "nouveau: stub superioctl" 

This reverts commit 2370ded79b.

Err.. didn't mean for that to slip in :)
main
Ben Skeggs 2007-11-14 05:11:11 +11:00
parent eb5487b9ca
commit 7e4bb6099a
6 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux-core/Makefile.kernel
View File

@ -23,7 +23,7 @@ i915-objs := i915_drv.o i915_dma.o i915_irq.o i915_mem.o i915_fence.o \
i915_buffer.o i915_compat.o
nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \
nouveau_object.o nouveau_irq.o nouveau_notifier.o nouveau_swmthd.o \
nouveau_sgdma.o nouveau_dma.o nouveau_bo.o nouveau_fence.o \
nouveau_sgdma.o nouveau_dma.o nouveau_buffer.o nouveau_fence.o \
nv04_timer.o \
nv04_mc.o nv40_mc.o nv50_mc.o \
nv04_fb.o nv10_fb.o nv40_fb.o \

9
linux-core/nouveau_bo.c → linux-core/nouveau_buffer.c
View File

@ -254,12 +254,3 @@ struct drm_bo_driver nouveau_bo_driver = {
.move = nouveau_bo_move,
.ttm_cache_flush= nouveau_bo_flush_ttm
};
int
nouveau_bo_validate(struct drm_device *dev, void *data,
struct drm_file *file_priv)
{
DRM_ERROR("unimplemented\n");
return -EINVAL;
}

6
shared-core/nouveau_drm.h
View File

@ -25,7 +25,7 @@
#ifndef __NOUVEAU_DRM_H__
#define __NOUVEAU_DRM_H__
#define NOUVEAU_DRM_HEADER_PATCHLEVEL 11
#define NOUVEAU_DRM_HEADER_PATCHLEVEL 10
struct drm_nouveau_channel_alloc {
uint32_t fb_ctxdma_handle;
@ -117,9 +117,6 @@ struct drm_nouveau_setparam {
uint64_t value;
};
struct drm_nouveau_bo_validate {
};
enum nouveau_card_type {
NV_UNKNOWN =0,
NV_04 =4,
@ -159,6 +156,5 @@ struct drm_nouveau_sarea {
#define DRM_NOUVEAU_GPUOBJ_FREE 0x07
#define DRM_NOUVEAU_MEM_ALLOC 0x08
#define DRM_NOUVEAU_MEM_FREE 0x09
#define DRM_NOUVEAU_BO_VALIDATE 0x0a
#endif /* __NOUVEAU_DRM_H__ */

6
shared-core/nouveau_drv.h
View File

@ -34,7 +34,7 @@
#define DRIVER_MAJOR 0
#define DRIVER_MINOR 0
#define DRIVER_PATCHLEVEL 11
#define DRIVER_PATCHLEVEL 10
#define NOUVEAU_FAMILY 0x0000FFFF
#define NOUVEAU_FLAGS 0xFFFF0000
@ -572,10 +572,8 @@ extern void nv04_timer_takedown(struct drm_device *);
extern long nouveau_compat_ioctl(struct file *file, unsigned int cmd,
unsigned long arg);
/* nouveau_bo.c */
/* nouveau_buffer.c */
extern struct drm_bo_driver nouveau_bo_driver;
extern int nouveau_bo_validate(struct drm_device *, void *data,
struct drm_file *);
/* nouveau_fence.c */
extern struct drm_fence_driver nouveau_fence_driver;

1
shared-core/nouveau_fifo.c
View File

@ -585,7 +585,6 @@ struct drm_ioctl_desc nouveau_ioctls[] = {
DRM_IOCTL_DEF(DRM_NOUVEAU_GPUOBJ_FREE, nouveau_ioctl_gpuobj_free, DRM_AUTH),
DRM_IOCTL_DEF(DRM_NOUVEAU_MEM_ALLOC, nouveau_ioctl_mem_alloc, DRM_AUTH),
DRM_IOCTL_DEF(DRM_NOUVEAU_MEM_FREE, nouveau_ioctl_mem_free, DRM_AUTH),
DRM_IOCTL_DEF(DRM_NOUVEAU_BO_VALIDATE, nouveau_bo_validate, DRM_AUTH),
};
int nouveau_max_ioctl = DRM_ARRAY_SIZE(nouveau_ioctls);

2
shared-core/nouveau_state.c
View File

@ -290,7 +290,7 @@ nouveau_card_init(struct drm_device *dev)
if (dev_priv->init_state == NOUVEAU_CARD_INIT_DONE)
return 0;
dev_priv->ttm = 1;
dev_priv->ttm = 0;
/* Map any PCI resources we need on the card */
ret = nouveau_init_card_mappings(dev);