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

nouveau: nuke internal typedefs, and drm_device_t use.

main
Ben Skeggs 2007-07-13 15:09:31 +10:00
parent 851c950d98
commit 0029713451
27 changed files with 554 additions and 552 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
shared-core/nouveau_drm.h
View File

@ -27,7 +27,7 @@
#define NOUVEAU_DRM_HEADER_PATCHLEVEL 9 #define NOUVEAU_DRM_HEADER_PATCHLEVEL 9
typedef struct drm_nouveau_fifo_alloc { struct drm_nouveau_fifo_alloc {
uint32_t fb_ctxdma_handle; uint32_t fb_ctxdma_handle;
uint32_t tt_ctxdma_handle; uint32_t tt_ctxdma_handle;
@ -42,27 +42,24 @@ typedef struct drm_nouveau_fifo_alloc {
/* Notifier memory */ /* Notifier memory */
drm_handle_t notifier; drm_handle_t notifier;
int notifier_size; int notifier_size;
} };
drm_nouveau_fifo_alloc_t;
typedef struct drm_nouveau_grobj_alloc { struct drm_nouveau_grobj_alloc {
int channel; int channel;
uint32_t handle; uint32_t handle;
int class; int class;
} };
drm_nouveau_grobj_alloc_t;
#define NOUVEAU_MEM_ACCESS_RO 1 #define NOUVEAU_MEM_ACCESS_RO 1
#define NOUVEAU_MEM_ACCESS_WO 2 #define NOUVEAU_MEM_ACCESS_WO 2
#define NOUVEAU_MEM_ACCESS_RW 3 #define NOUVEAU_MEM_ACCESS_RW 3
typedef struct drm_nouveau_notifier_alloc { struct drm_nouveau_notifier_alloc {
int channel; int channel;
uint32_t handle; uint32_t handle;
int count; int count;
uint32_t offset; uint32_t offset;
} };
drm_nouveau_notifier_alloc_t;
#define NOUVEAU_MEM_FB 0x00000001 #define NOUVEAU_MEM_FB 0x00000001
#define NOUVEAU_MEM_AGP 0x00000002 #define NOUVEAU_MEM_AGP 0x00000002
@ -76,20 +73,18 @@ drm_nouveau_notifier_alloc_t;
#define NOUVEAU_MEM_INSTANCE 0x00000200 /* internal */ #define NOUVEAU_MEM_INSTANCE 0x00000200 /* internal */
#define NOUVEAU_MEM_NOTIFIER 0x00000400 /* internal */ #define NOUVEAU_MEM_NOTIFIER 0x00000400 /* internal */
typedef struct drm_nouveau_mem_alloc { struct drm_nouveau_mem_alloc {
int flags; int flags;
int alignment; int alignment;
uint64_t size; // in bytes uint64_t size; // in bytes
uint64_t offset; uint64_t offset;
drm_handle_t map_handle; drm_handle_t map_handle;
} };
drm_nouveau_mem_alloc_t;
typedef struct drm_nouveau_mem_free { struct drm_nouveau_mem_free {
uint64_t offset; uint64_t offset;
int flags; int flags;
} };
drm_nouveau_mem_free_t;
/* FIXME : maybe unify {GET,SET}PARAMs */ /* FIXME : maybe unify {GET,SET}PARAMs */
#define NOUVEAU_GETPARAM_PCI_VENDOR 3 #define NOUVEAU_GETPARAM_PCI_VENDOR 3
@ -100,19 +95,17 @@ drm_nouveau_mem_free_t;
#define NOUVEAU_GETPARAM_FB_SIZE 8 #define NOUVEAU_GETPARAM_FB_SIZE 8
#define NOUVEAU_GETPARAM_AGP_SIZE 9 #define NOUVEAU_GETPARAM_AGP_SIZE 9
#define NOUVEAU_GETPARAM_PCI_PHYSICAL 10 #define NOUVEAU_GETPARAM_PCI_PHYSICAL 10
typedef struct drm_nouveau_getparam { struct drm_nouveau_getparam {
uint64_t param; uint64_t param;
uint64_t value; uint64_t value;
} };
drm_nouveau_getparam_t;
#define NOUVEAU_SETPARAM_CMDBUF_LOCATION 1 #define NOUVEAU_SETPARAM_CMDBUF_LOCATION 1
#define NOUVEAU_SETPARAM_CMDBUF_SIZE 2 #define NOUVEAU_SETPARAM_CMDBUF_SIZE 2
typedef struct drm_nouveau_setparam { struct drm_nouveau_setparam {
uint64_t param; uint64_t param;
uint64_t value; uint64_t value;
} };
drm_nouveau_setparam_t;
enum nouveau_card_type { enum nouveau_card_type {
NV_UNKNOWN =0, NV_UNKNOWN =0,
@ -142,12 +135,11 @@ enum nouveau_bus_type {
#define NOUVEAU_MAX_SAREA_CLIPRECTS 16 #define NOUVEAU_MAX_SAREA_CLIPRECTS 16
typedef struct drm_nouveau_sarea { struct drm_nouveau_sarea {
/* the cliprects */ /* the cliprects */
drm_clip_rect_t boxes[NOUVEAU_MAX_SAREA_CLIPRECTS]; drm_clip_rect_t boxes[NOUVEAU_MAX_SAREA_CLIPRECTS];
unsigned int nbox; unsigned int nbox;
} };
drm_nouveau_sarea_t;
#define DRM_NOUVEAU_FIFO_ALLOC 0x00 #define DRM_NOUVEAU_FIFO_ALLOC 0x00
#define DRM_NOUVEAU_GROBJ_ALLOC 0x01 #define DRM_NOUVEAU_GROBJ_ALLOC 0x01

314
shared-core/nouveau_drv.h
View File

@ -66,7 +66,7 @@ enum nouveau_flags {
#define NVOBJ_FLAG_ZERO_ALLOC (1 << 1) #define NVOBJ_FLAG_ZERO_ALLOC (1 << 1)
#define NVOBJ_FLAG_ZERO_FREE (1 << 2) #define NVOBJ_FLAG_ZERO_FREE (1 << 2)
#define NVOBJ_FLAG_FAKE (1 << 3) #define NVOBJ_FLAG_FAKE (1 << 3)
typedef struct nouveau_gpuobj { struct nouveau_gpuobj {
struct nouveau_gpuobj *next; struct nouveau_gpuobj *next;
struct nouveau_gpuobj *prev; struct nouveau_gpuobj *prev;
@ -80,17 +80,17 @@ typedef struct nouveau_gpuobj {
uint32_t engine; uint32_t engine;
uint32_t class; uint32_t class;
} nouveau_gpuobj_t; };
typedef struct nouveau_gpuobj_ref { struct nouveau_gpuobj_ref {
struct nouveau_gpuobj_ref *next; struct nouveau_gpuobj_ref *next;
nouveau_gpuobj_t *gpuobj; struct nouveau_gpuobj *gpuobj;
uint32_t instance; uint32_t instance;
int channel; int channel;
int handle; int handle;
} nouveau_gpuobj_ref_t; };
struct nouveau_fifo struct nouveau_fifo
{ {
@ -102,7 +102,7 @@ struct nouveau_fifo
drm_local_map_t *regs; drm_local_map_t *regs;
/* DMA push buffer */ /* DMA push buffer */
nouveau_gpuobj_ref_t *pushbuf; struct nouveau_gpuobj_ref *pushbuf;
struct mem_block *pushbuf_mem; struct mem_block *pushbuf_mem;
uint32_t pushbuf_base; uint32_t pushbuf_base;
@ -112,17 +112,17 @@ struct nouveau_fifo
drm_local_map_t *notifier_map; drm_local_map_t *notifier_map;
/* PFIFO context */ /* PFIFO context */
nouveau_gpuobj_ref_t *ramfc; struct nouveau_gpuobj_ref *ramfc;
/* PGRAPH context */ /* PGRAPH context */
nouveau_gpuobj_ref_t *ramin_grctx; struct nouveau_gpuobj_ref *ramin_grctx;
uint32_t pgraph_ctx [340]; /* XXX dynamic alloc ? */ uint32_t pgraph_ctx [340]; /* XXX dynamic alloc ? */
/* Objects */ /* Objects */
nouveau_gpuobj_ref_t *ramin; /* Private instmem */ struct nouveau_gpuobj_ref *ramin; /* Private instmem */
struct mem_block *ramin_heap; /* Private PRAMIN heap */ struct mem_block *ramin_heap; /* Private PRAMIN heap */
nouveau_gpuobj_ref_t *ramht; /* Hash table */ struct nouveau_gpuobj_ref *ramht; /* Hash table */
nouveau_gpuobj_ref_t *ramht_refs; /* Objects referenced by RAMHT */ struct nouveau_gpuobj_ref *ramht_refs; /* Objects referenced by RAMHT */
}; };
struct nouveau_config { struct nouveau_config {
@ -132,59 +132,59 @@ struct nouveau_config {
} cmdbuf; } cmdbuf;
}; };
typedef struct nouveau_engine_func { struct nouveau_engine_func {
struct { struct {
void *priv; void *priv;
int (*init)(drm_device_t *dev); int (*init)(struct drm_device *dev);
void (*takedown)(drm_device_t *dev); void (*takedown)(struct drm_device *dev);
int (*populate)(drm_device_t *, nouveau_gpuobj_t *, int (*populate)(struct drm_device *, struct nouveau_gpuobj *,
uint32_t *size); uint32_t *size);
void (*clear)(drm_device_t *, nouveau_gpuobj_t *); void (*clear)(struct drm_device *, struct nouveau_gpuobj *);
int (*bind)(drm_device_t *, nouveau_gpuobj_t *); int (*bind)(struct drm_device *, struct nouveau_gpuobj *);
int (*unbind)(drm_device_t *, nouveau_gpuobj_t *); int (*unbind)(struct drm_device *, struct nouveau_gpuobj *);
} instmem; } instmem;
struct { struct {
int (*init)(drm_device_t *dev); int (*init)(struct drm_device *dev);
void (*takedown)(drm_device_t *dev); void (*takedown)(struct drm_device *dev);
} mc; } mc;
struct { struct {
int (*init)(drm_device_t *dev); int (*init)(struct drm_device *dev);
void (*takedown)(drm_device_t *dev); void (*takedown)(struct drm_device *dev);
} timer; } timer;
struct { struct {
int (*init)(drm_device_t *dev); int (*init)(struct drm_device *dev);
void (*takedown)(drm_device_t *dev); void (*takedown)(struct drm_device *dev);
} fb; } fb;
struct { struct {
int (*init)(drm_device_t *); int (*init)(struct drm_device *);
void (*takedown)(drm_device_t *); void (*takedown)(struct drm_device *);
int (*create_context)(drm_device_t *, int channel); int (*create_context)(struct drm_device *, int channel);
void (*destroy_context)(drm_device_t *, int channel); void (*destroy_context)(struct drm_device *, int channel);
int (*load_context)(drm_device_t *, int channel); int (*load_context)(struct drm_device *, int channel);
int (*save_context)(drm_device_t *, int channel); int (*save_context)(struct drm_device *, int channel);
} graph; } graph;
struct { struct {
void *priv; void *priv;
int (*init)(drm_device_t *); int (*init)(struct drm_device *);
void (*takedown)(drm_device_t *); void (*takedown)(struct drm_device *);
int (*create_context)(drm_device_t *, int channel); int (*create_context)(struct drm_device *, int channel);
void (*destroy_context)(drm_device_t *, int channel); void (*destroy_context)(struct drm_device *, int channel);
int (*load_context)(drm_device_t *, int channel); int (*load_context)(struct drm_device *, int channel);
int (*save_context)(drm_device_t *, int channel); int (*save_context)(struct drm_device *, int channel);
} fifo; } fifo;
} nouveau_engine_func_t; };
typedef struct drm_nouveau_private { struct drm_nouveau_private {
enum { enum {
NOUVEAU_CARD_INIT_DOWN, NOUVEAU_CARD_INIT_DOWN,
NOUVEAU_CARD_INIT_DONE, NOUVEAU_CARD_INIT_DONE,
@ -207,7 +207,7 @@ typedef struct drm_nouveau_private {
struct nouveau_engine_func Engine; struct nouveau_engine_func Engine;
/* RAMIN configuration, RAMFC, RAMHT and RAMRO offsets */ /* RAMIN configuration, RAMFC, RAMHT and RAMRO offsets */
nouveau_gpuobj_t *ramht; struct nouveau_gpuobj *ramht;
uint32_t ramin_rsvd_vram; uint32_t ramin_rsvd_vram;
uint32_t ramht_offset; uint32_t ramht_offset;
uint32_t ramht_size; uint32_t ramht_size;
@ -234,16 +234,15 @@ typedef struct drm_nouveau_private {
/* context table pointed to be NV_PGRAPH_CHANNEL_CTX_TABLE (0x400780) */ /* context table pointed to be NV_PGRAPH_CHANNEL_CTX_TABLE (0x400780) */
uint32_t ctx_table_size; uint32_t ctx_table_size;
nouveau_gpuobj_ref_t *ctx_table; struct nouveau_gpuobj_ref *ctx_table;
struct nouveau_config config; struct nouveau_config config;
nouveau_gpuobj_t *gpuobj_all; struct nouveau_gpuobj *gpuobj_all;
} };
drm_nouveau_private_t;
/* nouveau_state.c */ /* nouveau_state.c */
extern void nouveau_preclose(drm_device_t * dev, DRMFILE filp); extern void nouveau_preclose(struct drm_device * dev, DRMFILE filp);
extern int nouveau_load(struct drm_device *dev, unsigned long flags); extern int nouveau_load(struct drm_device *dev, unsigned long flags);
extern int nouveau_firstopen(struct drm_device *dev); extern int nouveau_firstopen(struct drm_device *dev);
extern void nouveau_lastclose(struct drm_device *dev); extern void nouveau_lastclose(struct drm_device *dev);
@ -271,172 +270,175 @@ extern int nouveau_mem_init(struct drm_device *dev);
extern void nouveau_mem_close(struct drm_device *dev); extern void nouveau_mem_close(struct drm_device *dev);
/* nouveau_notifier.c */ /* nouveau_notifier.c */
extern int nouveau_notifier_init_channel(drm_device_t *, int channel, DRMFILE); extern int nouveau_notifier_init_channel(struct drm_device *, int channel, DRMFILE);
extern void nouveau_notifier_takedown_channel(drm_device_t *, int channel); extern void nouveau_notifier_takedown_channel(struct drm_device *, int channel);
extern int nouveau_notifier_alloc(drm_device_t *, int channel, extern int nouveau_notifier_alloc(struct drm_device *, int channel,
uint32_t handle, int cout, uint32_t *offset); uint32_t handle, int cout, uint32_t *offset);
extern int nouveau_ioctl_notifier_alloc(DRM_IOCTL_ARGS); extern int nouveau_ioctl_notifier_alloc(DRM_IOCTL_ARGS);
/* nouveau_fifo.c */ /* nouveau_fifo.c */
extern int nouveau_fifo_init(drm_device_t *dev); extern int nouveau_fifo_init(struct drm_device *dev);
extern int nouveau_fifo_number(drm_device_t *dev); extern int nouveau_fifo_number(struct drm_device *dev);
extern int nouveau_fifo_ctx_size(drm_device_t *dev); extern int nouveau_fifo_ctx_size(struct drm_device *dev);
extern void nouveau_fifo_cleanup(drm_device_t *dev, DRMFILE filp); extern void nouveau_fifo_cleanup(struct drm_device *dev, DRMFILE filp);
extern int nouveau_fifo_owner(drm_device_t *dev, DRMFILE filp, int channel); extern int nouveau_fifo_owner(struct drm_device *dev, DRMFILE filp, int channel);
extern void nouveau_fifo_free(drm_device_t *dev, int channel); extern void nouveau_fifo_free(struct drm_device *dev, int channel);
/* nouveau_object.c */ /* nouveau_object.c */
extern void nouveau_gpuobj_takedown(drm_device_t *dev); extern void nouveau_gpuobj_takedown(struct drm_device *dev);
extern int nouveau_gpuobj_channel_init(drm_device_t *, int channel, extern int nouveau_gpuobj_channel_init(struct drm_device *, int channel,
uint32_t vram_h, uint32_t tt_h); uint32_t vram_h, uint32_t tt_h);
extern void nouveau_gpuobj_channel_takedown(drm_device_t *, int channel); extern void nouveau_gpuobj_channel_takedown(struct drm_device *, int channel);
extern int nouveau_gpuobj_new(drm_device_t *, int channel, int size, int align, extern int nouveau_gpuobj_new(struct drm_device *, int channel, int size, int align,
uint32_t flags, nouveau_gpuobj_t **); uint32_t flags, struct nouveau_gpuobj **);
extern int nouveau_gpuobj_del(drm_device_t *, nouveau_gpuobj_t **); extern int nouveau_gpuobj_del(struct drm_device *, struct nouveau_gpuobj **);
extern int nouveau_gpuobj_ref_add(drm_device_t *, int channel, uint32_t handle, extern int nouveau_gpuobj_ref_add(struct drm_device *, int channel, uint32_t handle,
nouveau_gpuobj_t *, nouveau_gpuobj_ref_t **); struct nouveau_gpuobj *,
extern int nouveau_gpuobj_ref_del(drm_device_t *, nouveau_gpuobj_ref_t **); struct nouveau_gpuobj_ref **);
extern int nouveau_gpuobj_new_ref(drm_device_t *, int chan_obj, int chan_ref, extern int nouveau_gpuobj_ref_del(struct drm_device *, struct nouveau_gpuobj_ref **);
extern int nouveau_gpuobj_new_ref(struct drm_device *, int chan_obj, int chan_ref,
uint32_t handle, int size, int align, uint32_t handle, int size, int align,
uint32_t flags, nouveau_gpuobj_ref_t **); uint32_t flags, struct nouveau_gpuobj_ref **);
extern int nouveau_gpuobj_new_fake(drm_device_t *, uint32_t offset, extern int nouveau_gpuobj_new_fake(struct drm_device *, uint32_t offset,
uint32_t size, uint32_t flags, uint32_t size, uint32_t flags,
nouveau_gpuobj_t**, nouveau_gpuobj_ref_t**); struct nouveau_gpuobj**,
extern int nouveau_gpuobj_dma_new(drm_device_t *, int channel, int class, struct nouveau_gpuobj_ref**);
extern int nouveau_gpuobj_dma_new(struct drm_device *, int channel, int class,
uint64_t offset, uint64_t size, uint64_t offset, uint64_t size,
int access, int target, nouveau_gpuobj_t **); int access, int target,
extern int nouveau_gpuobj_gr_new(drm_device_t *, int channel, int class, struct nouveau_gpuobj **);
nouveau_gpuobj_t **); extern int nouveau_gpuobj_gr_new(struct drm_device *, int channel, int class,
struct nouveau_gpuobj **);
extern int nouveau_ioctl_grobj_alloc(DRM_IOCTL_ARGS); extern int nouveau_ioctl_grobj_alloc(DRM_IOCTL_ARGS);
/* nouveau_irq.c */ /* nouveau_irq.c */
extern irqreturn_t nouveau_irq_handler(DRM_IRQ_ARGS); extern irqreturn_t nouveau_irq_handler(DRM_IRQ_ARGS);
extern void nouveau_irq_preinstall(drm_device_t*); extern void nouveau_irq_preinstall(struct drm_device*);
extern void nouveau_irq_postinstall(drm_device_t*); extern void nouveau_irq_postinstall(struct drm_device*);
extern void nouveau_irq_uninstall(drm_device_t*); extern void nouveau_irq_uninstall(struct drm_device*);
/* nv04_fb.c */ /* nv04_fb.c */
extern int nv04_fb_init(drm_device_t *dev); extern int nv04_fb_init(struct drm_device *dev);
extern void nv04_fb_takedown(drm_device_t *dev); extern void nv04_fb_takedown(struct drm_device *dev);
/* nv10_fb.c */ /* nv10_fb.c */
extern int nv10_fb_init(drm_device_t *dev); extern int nv10_fb_init(struct drm_device *dev);
extern void nv10_fb_takedown(drm_device_t *dev); extern void nv10_fb_takedown(struct drm_device *dev);
/* nv40_fb.c */ /* nv40_fb.c */
extern int nv40_fb_init(drm_device_t *dev); extern int nv40_fb_init(struct drm_device *dev);
extern void nv40_fb_takedown(drm_device_t *dev); extern void nv40_fb_takedown(struct drm_device *dev);
/* nv04_fifo.c */ /* nv04_fifo.c */
extern int nv04_fifo_create_context(drm_device_t *dev, int channel); extern int nv04_fifo_create_context(struct drm_device *dev, int channel);
extern void nv04_fifo_destroy_context(drm_device_t *dev, int channel); extern void nv04_fifo_destroy_context(struct drm_device *dev, int channel);
extern int nv04_fifo_load_context(drm_device_t *dev, int channel); extern int nv04_fifo_load_context(struct drm_device *dev, int channel);
extern int nv04_fifo_save_context(drm_device_t *dev, int channel); extern int nv04_fifo_save_context(struct drm_device *dev, int channel);
/* nv10_fifo.c */ /* nv10_fifo.c */
extern int nv10_fifo_create_context(drm_device_t *dev, int channel); extern int nv10_fifo_create_context(struct drm_device *dev, int channel);
extern void nv10_fifo_destroy_context(drm_device_t *dev, int channel); extern void nv10_fifo_destroy_context(struct drm_device *dev, int channel);
extern int nv10_fifo_load_context(drm_device_t *dev, int channel); extern int nv10_fifo_load_context(struct drm_device *dev, int channel);
extern int nv10_fifo_save_context(drm_device_t *dev, int channel); extern int nv10_fifo_save_context(struct drm_device *dev, int channel);
/* nv40_fifo.c */ /* nv40_fifo.c */
extern int nv40_fifo_create_context(drm_device_t *, int channel); extern int nv40_fifo_create_context(struct drm_device *, int channel);
extern void nv40_fifo_destroy_context(drm_device_t *, int channel); extern void nv40_fifo_destroy_context(struct drm_device *, int channel);
extern int nv40_fifo_load_context(drm_device_t *, int channel); extern int nv40_fifo_load_context(struct drm_device *, int channel);
extern int nv40_fifo_save_context(drm_device_t *, int channel); extern int nv40_fifo_save_context(struct drm_device *, int channel);
/* nv50_fifo.c */ /* nv50_fifo.c */
extern int nv50_fifo_init(drm_device_t *); extern int nv50_fifo_init(struct drm_device *);
extern void nv50_fifo_takedown(drm_device_t *); extern void nv50_fifo_takedown(struct drm_device *);
extern int nv50_fifo_create_context(drm_device_t *, int channel); extern int nv50_fifo_create_context(struct drm_device *, int channel);
extern void nv50_fifo_destroy_context(drm_device_t *, int channel); extern void nv50_fifo_destroy_context(struct drm_device *, int channel);
extern int nv50_fifo_load_context(drm_device_t *, int channel); extern int nv50_fifo_load_context(struct drm_device *, int channel);
extern int nv50_fifo_save_context(drm_device_t *, int channel); extern int nv50_fifo_save_context(struct drm_device *, int channel);
/* nv04_graph.c */ /* nv04_graph.c */
extern void nouveau_nv04_context_switch(drm_device_t *dev); extern void nouveau_nv04_context_switch(struct drm_device *dev);
extern int nv04_graph_init(drm_device_t *dev); extern int nv04_graph_init(struct drm_device *dev);
extern void nv04_graph_takedown(drm_device_t *dev); extern void nv04_graph_takedown(struct drm_device *dev);
extern int nv04_graph_create_context(drm_device_t *dev, int channel); extern int nv04_graph_create_context(struct drm_device *dev, int channel);
extern void nv04_graph_destroy_context(drm_device_t *dev, int channel); extern void nv04_graph_destroy_context(struct drm_device *dev, int channel);
extern int nv04_graph_load_context(drm_device_t *dev, int channel); extern int nv04_graph_load_context(struct drm_device *dev, int channel);
extern int nv04_graph_save_context(drm_device_t *dev, int channel); extern int nv04_graph_save_context(struct drm_device *dev, int channel);
/* nv10_graph.c */ /* nv10_graph.c */
extern void nouveau_nv10_context_switch(drm_device_t *dev); extern void nouveau_nv10_context_switch(struct drm_device *dev);
extern int nv10_graph_init(drm_device_t *dev); extern int nv10_graph_init(struct drm_device *dev);
extern void nv10_graph_takedown(drm_device_t *dev); extern void nv10_graph_takedown(struct drm_device *dev);
extern int nv10_graph_create_context(drm_device_t *dev, int channel); extern int nv10_graph_create_context(struct drm_device *dev, int channel);
extern void nv10_graph_destroy_context(drm_device_t *dev, int channel); extern void nv10_graph_destroy_context(struct drm_device *dev, int channel);
extern int nv10_graph_load_context(drm_device_t *dev, int channel); extern int nv10_graph_load_context(struct drm_device *dev, int channel);
extern int nv10_graph_save_context(drm_device_t *dev, int channel); extern int nv10_graph_save_context(struct drm_device *dev, int channel);
/* nv20_graph.c */ /* nv20_graph.c */
extern void nouveau_nv20_context_switch(drm_device_t *dev); extern void nouveau_nv20_context_switch(struct drm_device *dev);
extern int nv20_graph_init(drm_device_t *dev); extern int nv20_graph_init(struct drm_device *dev);
extern void nv20_graph_takedown(drm_device_t *dev); extern void nv20_graph_takedown(struct drm_device *dev);
extern int nv20_graph_create_context(drm_device_t *dev, int channel); extern int nv20_graph_create_context(struct drm_device *dev, int channel);
extern void nv20_graph_destroy_context(drm_device_t *dev, int channel); extern void nv20_graph_destroy_context(struct drm_device *dev, int channel);
extern int nv20_graph_load_context(drm_device_t *dev, int channel); extern int nv20_graph_load_context(struct drm_device *dev, int channel);
extern int nv20_graph_save_context(drm_device_t *dev, int channel); extern int nv20_graph_save_context(struct drm_device *dev, int channel);
/* nv30_graph.c */ /* nv30_graph.c */
extern int nv30_graph_init(drm_device_t *dev); extern int nv30_graph_init(struct drm_device *dev);
extern void nv30_graph_takedown(drm_device_t *dev); extern void nv30_graph_takedown(struct drm_device *dev);
extern int nv30_graph_create_context(drm_device_t *, int channel); extern int nv30_graph_create_context(struct drm_device *, int channel);
extern void nv30_graph_destroy_context(drm_device_t *, int channel); extern void nv30_graph_destroy_context(struct drm_device *, int channel);
extern int nv30_graph_load_context(drm_device_t *, int channel); extern int nv30_graph_load_context(struct drm_device *, int channel);
extern int nv30_graph_save_context(drm_device_t *, int channel); extern int nv30_graph_save_context(struct drm_device *, int channel);
/* nv40_graph.c */ /* nv40_graph.c */
extern int nv40_graph_init(drm_device_t *); extern int nv40_graph_init(struct drm_device *);
extern void nv40_graph_takedown(drm_device_t *); extern void nv40_graph_takedown(struct drm_device *);
extern int nv40_graph_create_context(drm_device_t *, int channel); extern int nv40_graph_create_context(struct drm_device *, int channel);
extern void nv40_graph_destroy_context(drm_device_t *, int channel); extern void nv40_graph_destroy_context(struct drm_device *, int channel);
extern int nv40_graph_load_context(drm_device_t *, int channel); extern int nv40_graph_load_context(struct drm_device *, int channel);
extern int nv40_graph_save_context(drm_device_t *, int channel); extern int nv40_graph_save_context(struct drm_device *, int channel);
/* nv50_graph.c */ /* nv50_graph.c */
extern int nv50_graph_init(drm_device_t *); extern int nv50_graph_init(struct drm_device *);
extern void nv50_graph_takedown(drm_device_t *); extern void nv50_graph_takedown(struct drm_device *);
extern int nv50_graph_create_context(drm_device_t *, int channel); extern int nv50_graph_create_context(struct drm_device *, int channel);
extern void nv50_graph_destroy_context(drm_device_t *, int channel); extern void nv50_graph_destroy_context(struct drm_device *, int channel);
extern int nv50_graph_load_context(drm_device_t *, int channel); extern int nv50_graph_load_context(struct drm_device *, int channel);
extern int nv50_graph_save_context(drm_device_t *, int channel); extern int nv50_graph_save_context(struct drm_device *, int channel);
/* nv04_instmem.c */ /* nv04_instmem.c */
extern int nv04_instmem_init(drm_device_t *dev); extern int nv04_instmem_init(struct drm_device *dev);
extern void nv04_instmem_takedown(drm_device_t *dev); extern void nv04_instmem_takedown(struct drm_device *dev);
extern int nv04_instmem_populate(drm_device_t*, nouveau_gpuobj_t*, extern int nv04_instmem_populate(struct drm_device*, struct nouveau_gpuobj*,
uint32_t *size); uint32_t *size);
extern void nv04_instmem_clear(drm_device_t*, nouveau_gpuobj_t*); extern void nv04_instmem_clear(struct drm_device*, struct nouveau_gpuobj*);
extern int nv04_instmem_bind(drm_device_t*, nouveau_gpuobj_t*); extern int nv04_instmem_bind(struct drm_device*, struct nouveau_gpuobj*);
extern int nv04_instmem_unbind(drm_device_t*, nouveau_gpuobj_t*); extern int nv04_instmem_unbind(struct drm_device*, struct nouveau_gpuobj*);
/* nv50_instmem.c */ /* nv50_instmem.c */
extern int nv50_instmem_init(drm_device_t *dev); extern int nv50_instmem_init(struct drm_device *dev);
extern void nv50_instmem_takedown(drm_device_t *dev); extern void nv50_instmem_takedown(struct drm_device *dev);
extern int nv50_instmem_populate(drm_device_t*, nouveau_gpuobj_t*, extern int nv50_instmem_populate(struct drm_device*, struct nouveau_gpuobj*,
uint32_t *size); uint32_t *size);
extern void nv50_instmem_clear(drm_device_t*, nouveau_gpuobj_t*); extern void nv50_instmem_clear(struct drm_device*, struct nouveau_gpuobj*);
extern int nv50_instmem_bind(drm_device_t*, nouveau_gpuobj_t*); extern int nv50_instmem_bind(struct drm_device*, struct nouveau_gpuobj*);
extern int nv50_instmem_unbind(drm_device_t*, nouveau_gpuobj_t*); extern int nv50_instmem_unbind(struct drm_device*, struct nouveau_gpuobj*);
/* nv04_mc.c */ /* nv04_mc.c */
extern int nv04_mc_init(drm_device_t *dev); extern int nv04_mc_init(struct drm_device *dev);
extern void nv04_mc_takedown(drm_device_t *dev); extern void nv04_mc_takedown(struct drm_device *dev);
/* nv40_mc.c */ /* nv40_mc.c */
extern int nv40_mc_init(drm_device_t *dev); extern int nv40_mc_init(struct drm_device *dev);
extern void nv40_mc_takedown(drm_device_t *dev); extern void nv40_mc_takedown(struct drm_device *dev);
/* nv50_mc.c */ /* nv50_mc.c */
extern int nv50_mc_init(drm_device_t *dev); extern int nv50_mc_init(struct drm_device *dev);
extern void nv50_mc_takedown(drm_device_t *dev); extern void nv50_mc_takedown(struct drm_device *dev);
/* nv04_timer.c */ /* nv04_timer.c */
extern int nv04_timer_init(drm_device_t *dev); extern int nv04_timer_init(struct drm_device *dev);
extern void nv04_timer_takedown(drm_device_t *dev); extern void nv04_timer_takedown(struct drm_device *dev);
extern long nouveau_compat_ioctl(struct file *filp, unsigned int cmd, extern long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
unsigned long arg); unsigned long arg);

49
shared-core/nouveau_fifo.c
View File

@ -29,9 +29,9 @@
/* returns the number of hw fifos */ /* returns the number of hw fifos */
int nouveau_fifo_number(drm_device_t* dev) int nouveau_fifo_number(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv=dev->dev_private; struct drm_nouveau_private *dev_priv=dev->dev_private;
switch(dev_priv->card_type) switch(dev_priv->card_type)
{ {
case NV_03: case NV_03:
@ -47,9 +47,9 @@ int nouveau_fifo_number(drm_device_t* dev)
} }
/* returns the size of fifo context */ /* returns the size of fifo context */
int nouveau_fifo_ctx_size(drm_device_t* dev) int nouveau_fifo_ctx_size(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv=dev->dev_private; struct drm_nouveau_private *dev_priv=dev->dev_private;
if (dev_priv->card_type >= NV_40) if (dev_priv->card_type >= NV_40)
return 128; return 128;
@ -68,9 +68,9 @@ int nouveau_fifo_ctx_size(drm_device_t* dev)
* voir nv_driver.c : NVPreInit * voir nv_driver.c : NVPreInit
*/ */
static int nouveau_fifo_instmem_configure(drm_device_t *dev) static int nouveau_fifo_instmem_configure(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
NV_WRITE(NV03_PFIFO_RAMHT, NV_WRITE(NV03_PFIFO_RAMHT,
(0x03 << 24) /* search 128 */ | (0x03 << 24) /* search 128 */ |
@ -109,9 +109,9 @@ static int nouveau_fifo_instmem_configure(drm_device_t *dev)
return 0; return 0;
} }
int nouveau_fifo_init(drm_device_t *dev) int nouveau_fifo_init(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
int ret; int ret;
NV_WRITE(NV03_PMC_ENABLE, NV_READ(NV03_PMC_ENABLE) & NV_WRITE(NV03_PMC_ENABLE, NV_READ(NV03_PMC_ENABLE) &
@ -187,12 +187,12 @@ int nouveau_fifo_init(drm_device_t *dev)
static int static int
nouveau_fifo_cmdbuf_alloc(struct drm_device *dev, int channel) nouveau_fifo_cmdbuf_alloc(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
struct nouveau_config *config = &dev_priv->config; struct nouveau_config *config = &dev_priv->config;
struct mem_block *cb; struct mem_block *cb;
int cb_min_size = max(NV03_FIFO_SIZE,PAGE_SIZE); int cb_min_size = max(NV03_FIFO_SIZE,PAGE_SIZE);
nouveau_gpuobj_t *pushbuf = NULL; struct nouveau_gpuobj *pushbuf = NULL;
int ret; int ret;
/* Defaults for unconfigured values */ /* Defaults for unconfigured values */
@ -258,12 +258,12 @@ nouveau_fifo_cmdbuf_alloc(struct drm_device *dev, int channel)
} }
/* allocates and initializes a fifo for user space consumption */ /* allocates and initializes a fifo for user space consumption */
int nouveau_fifo_alloc(drm_device_t* dev, int *chan_ret, DRMFILE filp, int nouveau_fifo_alloc(struct drm_device *dev, int *chan_ret, DRMFILE filp,
uint32_t vram_handle, uint32_t tt_handle) uint32_t vram_handle, uint32_t tt_handle)
{ {
int ret; int ret;
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
nouveau_engine_func_t *engine = &dev_priv->Engine; struct nouveau_engine_func *engine = &dev_priv->Engine;
struct nouveau_fifo *chan; struct nouveau_fifo *chan;
int channel; int channel;
@ -392,10 +392,10 @@ int nouveau_fifo_alloc(drm_device_t* dev, int *chan_ret, DRMFILE filp,
} }
/* stops a fifo */ /* stops a fifo */
void nouveau_fifo_free(drm_device_t* dev, int channel) void nouveau_fifo_free(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
nouveau_engine_func_t *engine = &dev_priv->Engine; struct nouveau_engine_func *engine = &dev_priv->Engine;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
if (!chan) { if (!chan) {
@ -436,10 +436,10 @@ void nouveau_fifo_free(drm_device_t* dev, int channel)
} }
/* cleanups all the fifos from filp */ /* cleanups all the fifos from filp */
void nouveau_fifo_cleanup(drm_device_t* dev, DRMFILE filp) void nouveau_fifo_cleanup(struct drm_device *dev, DRMFILE filp)
{ {
int i; int i;
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
DRM_DEBUG("clearing FIFO enables from filp\n"); DRM_DEBUG("clearing FIFO enables from filp\n");
for(i=0;i<nouveau_fifo_number(dev);i++) for(i=0;i<nouveau_fifo_number(dev);i++)
@ -448,9 +448,9 @@ void nouveau_fifo_cleanup(drm_device_t* dev, DRMFILE filp)
} }
int int
nouveau_fifo_owner(drm_device_t *dev, DRMFILE filp, int channel) nouveau_fifo_owner(struct drm_device *dev, DRMFILE filp, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
if (channel >= nouveau_fifo_number(dev)) if (channel >= nouveau_fifo_number(dev))
return 0; return 0;
@ -466,13 +466,14 @@ nouveau_fifo_owner(drm_device_t *dev, DRMFILE filp, int channel)
static int nouveau_ioctl_fifo_alloc(DRM_IOCTL_ARGS) static int nouveau_ioctl_fifo_alloc(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
drm_nouveau_fifo_alloc_t init; struct drm_nouveau_fifo_alloc init;
drm_map_list_t *entry; drm_map_list_t *entry;
struct nouveau_fifo *chan; struct nouveau_fifo *chan;
int res; int res;
DRM_COPY_FROM_USER_IOCTL(init, (drm_nouveau_fifo_alloc_t __user *) data, DRM_COPY_FROM_USER_IOCTL(init,
(struct drm_nouveau_fifo_alloc __user *) data,
sizeof(init)); sizeof(init));
if (init.fb_ctxdma_handle == ~0 || init.tt_ctxdma_handle == ~0) if (init.fb_ctxdma_handle == ~0 || init.tt_ctxdma_handle == ~0)
@ -515,7 +516,7 @@ static int nouveau_ioctl_fifo_alloc(DRM_IOCTL_ARGS)
init.notifier = chan->notifier_block->map_handle; init.notifier = chan->notifier_block->map_handle;
init.notifier_size = chan->notifier_block->size; init.notifier_size = chan->notifier_block->size;
DRM_COPY_TO_USER_IOCTL((drm_nouveau_fifo_alloc_t __user *)data, DRM_COPY_TO_USER_IOCTL((struct drm_nouveau_fifo_alloc __user *)data,
init, sizeof(init)); init, sizeof(init));
return 0; return 0;
} }

36
shared-core/nouveau_irq.c
View File

@ -36,9 +36,9 @@
#include "nouveau_drv.h" #include "nouveau_drv.h"
#include "nouveau_reg.h" #include "nouveau_reg.h"
void nouveau_irq_preinstall(drm_device_t *dev) void nouveau_irq_preinstall(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
DRM_DEBUG("IRQ: preinst\n"); DRM_DEBUG("IRQ: preinst\n");
@ -71,9 +71,9 @@ void nouveau_irq_preinstall(drm_device_t *dev)
NV_WRITE(NV03_PMC_INTR_EN_0, 0); NV_WRITE(NV03_PMC_INTR_EN_0, 0);
} }
void nouveau_irq_postinstall(drm_device_t *dev) void nouveau_irq_postinstall(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("AIII, no dev_priv\n"); DRM_ERROR("AIII, no dev_priv\n");
@ -107,9 +107,9 @@ void nouveau_irq_postinstall(drm_device_t *dev)
NV_WRITE(NV03_PMC_INTR_EN_0, NV_PMC_INTR_EN_0_MASTER_ENABLE); NV_WRITE(NV03_PMC_INTR_EN_0, NV_PMC_INTR_EN_0_MASTER_ENABLE);
} }
void nouveau_irq_uninstall(drm_device_t *dev) void nouveau_irq_uninstall(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("AIII, no dev_priv\n"); DRM_ERROR("AIII, no dev_priv\n");
@ -138,10 +138,10 @@ void nouveau_irq_uninstall(drm_device_t *dev)
NV_WRITE(NV03_PMC_INTR_EN_0, 0); NV_WRITE(NV03_PMC_INTR_EN_0, 0);
} }
static void nouveau_fifo_irq_handler(drm_device_t *dev) static void nouveau_fifo_irq_handler(struct drm_device *dev)
{ {
uint32_t status, chmode, chstat, channel; uint32_t status, chmode, chstat, channel;
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
status = NV_READ(NV03_PFIFO_INTR_0); status = NV_READ(NV03_PFIFO_INTR_0);
if (!status) if (!status)
@ -200,9 +200,9 @@ static void nouveau_fifo_irq_handler(drm_device_t *dev)
} }
#if 0 #if 0
static void nouveau_nv04_context_switch(drm_device_t *dev) static void nouveau_nv04_context_switch(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
uint32_t channel,i; uint32_t channel,i;
uint32_t max=0; uint32_t max=0;
NV_WRITE(NV04_PGRAPH_FIFO,0x0); NV_WRITE(NV04_PGRAPH_FIFO,0x0);
@ -247,9 +247,9 @@ static void nouveau_nv04_context_switch(drm_device_t *dev)
#endif #endif
static void static void
nouveau_graph_dump_trap_info(drm_device_t *dev) nouveau_graph_dump_trap_info(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
uint32_t address; uint32_t address;
uint32_t channel, class; uint32_t channel, class;
uint32_t method, subc, data; uint32_t method, subc, data;
@ -273,10 +273,10 @@ nouveau_graph_dump_trap_info(drm_device_t *dev)
); );
} }
static void nouveau_pgraph_irq_handler(drm_device_t *dev) static void nouveau_pgraph_irq_handler(struct drm_device *dev)
{ {
uint32_t status; uint32_t status;
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
status = NV_READ(NV03_PGRAPH_INTR); status = NV_READ(NV03_PGRAPH_INTR);
if (!status) if (!status)
@ -379,9 +379,9 @@ static void nouveau_pgraph_irq_handler(drm_device_t *dev)
NV_WRITE(NV03_PMC_INTR_0, NV_PMC_INTR_0_PGRAPH_PENDING); NV_WRITE(NV03_PMC_INTR_0, NV_PMC_INTR_0_PGRAPH_PENDING);
} }
static void nouveau_crtc_irq_handler(drm_device_t *dev, int crtc) static void nouveau_crtc_irq_handler(struct drm_device *dev, int crtc)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
if (crtc&1) { if (crtc&1) {
NV_WRITE(NV_CRTC0_INTSTAT, NV_CRTC_INTR_VBLANK); NV_WRITE(NV_CRTC0_INTSTAT, NV_CRTC_INTR_VBLANK);
} }
@ -393,8 +393,8 @@ static void nouveau_crtc_irq_handler(drm_device_t *dev, int crtc)
irqreturn_t nouveau_irq_handler(DRM_IRQ_ARGS) irqreturn_t nouveau_irq_handler(DRM_IRQ_ARGS)
{ {
drm_device_t *dev = (drm_device_t*)arg; struct drm_device *dev = (struct drm_device*)arg;
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
uint32_t status; uint32_t status;
status = NV_READ(NV03_PMC_INTR_0); status = NV_READ(NV03_PMC_INTR_0);

25
shared-core/nouveau_mem.c
View File

@ -208,7 +208,7 @@ void nouveau_mem_takedown(struct mem_block **heap)
void nouveau_mem_close(struct drm_device *dev) void nouveau_mem_close(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
nouveau_mem_takedown(&dev_priv->agp_heap); nouveau_mem_takedown(&dev_priv->agp_heap);
nouveau_mem_takedown(&dev_priv->fb_heap); nouveau_mem_takedown(&dev_priv->fb_heap);
if ( dev_priv->pci_heap ) if ( dev_priv->pci_heap )
@ -220,7 +220,7 @@ void nouveau_mem_close(struct drm_device *dev)
/* returns the amount of FB ram in bytes */ /* returns the amount of FB ram in bytes */
uint64_t nouveau_mem_fb_amount(struct drm_device *dev) uint64_t nouveau_mem_fb_amount(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv=dev->dev_private; struct drm_nouveau_private *dev_priv=dev->dev_private;
switch(dev_priv->card_type) switch(dev_priv->card_type)
{ {
case NV_03: case NV_03:
@ -285,7 +285,7 @@ uint64_t nouveau_mem_fb_amount(struct drm_device *dev)
int nouveau_mem_init(struct drm_device *dev) int nouveau_mem_init(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
uint32_t fb_size; uint32_t fb_size;
drm_scatter_gather_t sgreq; drm_scatter_gather_t sgreq;
dev_priv->agp_phys=0; dev_priv->agp_phys=0;
@ -405,7 +405,7 @@ struct mem_block* nouveau_mem_alloc(struct drm_device *dev, int alignment, uint6
{ {
struct mem_block *block; struct mem_block *block;
int type; int type;
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
/* /*
* Make things easier on ourselves: all allocations are page-aligned. * Make things easier on ourselves: all allocations are page-aligned.
@ -515,8 +515,8 @@ void nouveau_mem_free(struct drm_device* dev, struct mem_block* block)
int nouveau_ioctl_mem_alloc(DRM_IOCTL_ARGS) int nouveau_ioctl_mem_alloc(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
drm_nouveau_mem_alloc_t alloc; struct drm_nouveau_mem_alloc alloc;
struct mem_block *block; struct mem_block *block;
if (!dev_priv) { if (!dev_priv) {
@ -524,7 +524,8 @@ int nouveau_ioctl_mem_alloc(DRM_IOCTL_ARGS)
return DRM_ERR(EINVAL); return DRM_ERR(EINVAL);
} }
DRM_COPY_FROM_USER_IOCTL(alloc, (drm_nouveau_mem_alloc_t __user *) data, DRM_COPY_FROM_USER_IOCTL(alloc,
(struct drm_nouveau_mem_alloc_t __user *) data,
sizeof(alloc)); sizeof(alloc));
block=nouveau_mem_alloc(dev, alloc.alignment, alloc.size, alloc.flags, filp); block=nouveau_mem_alloc(dev, alloc.alignment, alloc.size, alloc.flags, filp);
@ -534,7 +535,8 @@ int nouveau_ioctl_mem_alloc(DRM_IOCTL_ARGS)
alloc.offset=block->start; alloc.offset=block->start;
alloc.flags=block->flags; alloc.flags=block->flags;
DRM_COPY_TO_USER_IOCTL((drm_nouveau_mem_alloc_t __user *) data, alloc, sizeof(alloc)); DRM_COPY_TO_USER_IOCTL((struct drm_nouveau_mem_alloc __user *)data,
alloc, sizeof(alloc));
return 0; return 0;
} }
@ -542,11 +544,12 @@ int nouveau_ioctl_mem_alloc(DRM_IOCTL_ARGS)
int nouveau_ioctl_mem_free(DRM_IOCTL_ARGS) int nouveau_ioctl_mem_free(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
drm_nouveau_mem_free_t memfree; struct drm_nouveau_mem_free memfree;
struct mem_block *block; struct mem_block *block;
DRM_COPY_FROM_USER_IOCTL(memfree, (drm_nouveau_mem_free_t __user *) data, DRM_COPY_FROM_USER_IOCTL(memfree,
(struct drm_nouveau_mem_free_t __user *)data,
sizeof(memfree)); sizeof(memfree));
block=NULL; block=NULL;

21
shared-core/nouveau_notifier.c
View File

@ -30,9 +30,9 @@
#include "nouveau_drv.h" #include "nouveau_drv.h"
int int
nouveau_notifier_init_channel(drm_device_t *dev, int channel, DRMFILE filp) nouveau_notifier_init_channel(struct drm_device *dev, int channel, DRMFILE filp)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
int flags, ret; int flags, ret;
@ -56,9 +56,9 @@ nouveau_notifier_init_channel(drm_device_t *dev, int channel, DRMFILE filp)
} }
void void
nouveau_notifier_takedown_channel(drm_device_t *dev, int channel) nouveau_notifier_takedown_channel(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
if (chan->notifier_block) { if (chan->notifier_block) {
@ -70,12 +70,12 @@ nouveau_notifier_takedown_channel(drm_device_t *dev, int channel)
} }
int int
nouveau_notifier_alloc(drm_device_t *dev, int channel, uint32_t handle, nouveau_notifier_alloc(struct drm_device *dev, int channel, uint32_t handle,
int count, uint32_t *b_offset) int count, uint32_t *b_offset)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
nouveau_gpuobj_t *nobj = NULL; struct nouveau_gpuobj *nobj = NULL;
struct mem_block *mem; struct mem_block *mem;
uint32_t offset; uint32_t offset;
int target, ret; int target, ret;
@ -127,10 +127,11 @@ int
nouveau_ioctl_notifier_alloc(DRM_IOCTL_ARGS) nouveau_ioctl_notifier_alloc(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_nouveau_notifier_alloc_t na; struct drm_nouveau_notifier_alloc na;
int ret; int ret;
DRM_COPY_FROM_USER_IOCTL(na, (drm_nouveau_notifier_alloc_t __user*)data, DRM_COPY_FROM_USER_IOCTL(na,
(struct drm_nouveau_notifier_alloc __user*)data,
sizeof(na)); sizeof(na));
if (!nouveau_fifo_owner(dev, filp, na.channel)) { if (!nouveau_fifo_owner(dev, filp, na.channel)) {
@ -144,7 +145,7 @@ nouveau_ioctl_notifier_alloc(DRM_IOCTL_ARGS)
if (ret) if (ret)
return ret; return ret;
DRM_COPY_TO_USER_IOCTL((drm_nouveau_notifier_alloc_t __user*)data, DRM_COPY_TO_USER_IOCTL((struct drm_nouveau_notifier_alloc __user*)data,
na, sizeof(na)); na, sizeof(na));
return 0; return 0;
} }

133
shared-core/nouveau_object.c
View File

@ -66,9 +66,9 @@
is given as: is given as:
*/ */
static uint32_t static uint32_t
nouveau_ramht_hash_handle(drm_device_t *dev, int channel, uint32_t handle) nouveau_ramht_hash_handle(struct drm_device *dev, int channel, uint32_t handle)
{ {
drm_nouveau_private_t *dev_priv=dev->dev_private; struct drm_nouveau_private *dev_priv=dev->dev_private;
uint32_t hash = 0; uint32_t hash = 0;
int i; int i;
@ -85,10 +85,10 @@ nouveau_ramht_hash_handle(drm_device_t *dev, int channel, uint32_t handle)
} }
static int static int
nouveau_ramht_entry_valid(drm_device_t *dev, nouveau_gpuobj_t *ramht, nouveau_ramht_entry_valid(struct drm_device *dev, struct nouveau_gpuobj *ramht,
uint32_t offset) uint32_t offset)
{ {
drm_nouveau_private_t *dev_priv=dev->dev_private; struct drm_nouveau_private *dev_priv=dev->dev_private;
uint32_t ctx = INSTANCE_RD(ramht, (offset + 4)/4); uint32_t ctx = INSTANCE_RD(ramht, (offset + 4)/4);
if (dev_priv->card_type < NV_40) if (dev_priv->card_type < NV_40)
@ -97,12 +97,12 @@ nouveau_ramht_entry_valid(drm_device_t *dev, nouveau_gpuobj_t *ramht,
} }
static int static int
nouveau_ramht_insert(drm_device_t* dev, nouveau_gpuobj_ref_t *ref) nouveau_ramht_insert(struct drm_device *dev, struct nouveau_gpuobj_ref *ref)
{ {
drm_nouveau_private_t *dev_priv=dev->dev_private; struct drm_nouveau_private *dev_priv=dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[ref->channel]; struct nouveau_fifo *chan = dev_priv->fifos[ref->channel];
nouveau_gpuobj_t *ramht = chan->ramht ? chan->ramht->gpuobj : NULL; struct nouveau_gpuobj *ramht = chan->ramht ? chan->ramht->gpuobj : NULL;
nouveau_gpuobj_t *gpuobj = ref->gpuobj; struct nouveau_gpuobj *gpuobj = ref->gpuobj;
uint32_t ctx, co, ho; uint32_t ctx, co, ho;
if (!ramht) { if (!ramht) {
@ -146,11 +146,11 @@ nouveau_ramht_insert(drm_device_t* dev, nouveau_gpuobj_ref_t *ref)
} }
static void static void
nouveau_ramht_remove(drm_device_t* dev, nouveau_gpuobj_ref_t *ref) nouveau_ramht_remove(struct drm_device *dev, struct nouveau_gpuobj_ref *ref)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[ref->channel]; struct nouveau_fifo *chan = dev_priv->fifos[ref->channel];
nouveau_gpuobj_t *ramht = chan->ramht ? chan->ramht->gpuobj : NULL; struct nouveau_gpuobj *ramht = chan->ramht ? chan->ramht->gpuobj : NULL;
uint32_t co, ho; uint32_t co, ho;
if (!ramht) { if (!ramht) {
@ -180,13 +180,13 @@ nouveau_ramht_remove(drm_device_t* dev, nouveau_gpuobj_ref_t *ref)
} }
int int
nouveau_gpuobj_new(drm_device_t *dev, int channel, int size, int align, nouveau_gpuobj_new(struct drm_device *dev, int channel, int size, int align,
uint32_t flags, nouveau_gpuobj_t **gpuobj_ret) uint32_t flags, struct nouveau_gpuobj **gpuobj_ret)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
nouveau_engine_func_t *engine = &dev_priv->Engine; struct nouveau_engine_func *engine = &dev_priv->Engine;
struct nouveau_fifo *chan = NULL; struct nouveau_fifo *chan = NULL;
nouveau_gpuobj_t *gpuobj; struct nouveau_gpuobj *gpuobj;
struct mem_block *pramin = NULL; struct mem_block *pramin = NULL;
int ret; int ret;
@ -270,10 +270,10 @@ nouveau_gpuobj_new(drm_device_t *dev, int channel, int size, int align,
return 0; return 0;
} }
void nouveau_gpuobj_takedown(drm_device_t *dev) void nouveau_gpuobj_takedown(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
nouveau_gpuobj_t *gpuobj = NULL; struct nouveau_gpuobj *gpuobj = NULL;
DRM_DEBUG("\n"); DRM_DEBUG("\n");
@ -285,11 +285,11 @@ void nouveau_gpuobj_takedown(drm_device_t *dev)
} }
} }
int nouveau_gpuobj_del(drm_device_t *dev, nouveau_gpuobj_t **pgpuobj) int nouveau_gpuobj_del(struct drm_device *dev, struct nouveau_gpuobj **pgpuobj)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
nouveau_engine_func_t *engine = &dev_priv->Engine; struct nouveau_engine_func *engine = &dev_priv->Engine;
nouveau_gpuobj_t *gpuobj; struct nouveau_gpuobj *gpuobj;
DRM_DEBUG("gpuobj %p\n", pgpuobj ? *pgpuobj : NULL); DRM_DEBUG("gpuobj %p\n", pgpuobj ? *pgpuobj : NULL);
@ -325,11 +325,11 @@ int nouveau_gpuobj_del(drm_device_t *dev, nouveau_gpuobj_t **pgpuobj)
} }
static int static int
nouveau_gpuobj_instance_get(drm_device_t *dev, int channel, nouveau_gpuobj_instance_get(struct drm_device *dev, int channel,
nouveau_gpuobj_t *gpuobj, uint32_t *inst) struct nouveau_gpuobj *gpuobj, uint32_t *inst)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
nouveau_gpuobj_t *cpramin; struct nouveau_gpuobj *cpramin;
/* <NV50 use PRAMIN address everywhere */ /* <NV50 use PRAMIN address everywhere */
if (dev_priv->card_type < NV_50) { if (dev_priv->card_type < NV_50) {
@ -371,12 +371,12 @@ nouveau_gpuobj_instance_get(drm_device_t *dev, int channel,
} }
int int
nouveau_gpuobj_ref_add(drm_device_t *dev, int channel, uint32_t handle, nouveau_gpuobj_ref_add(struct drm_device *dev, int channel, uint32_t handle,
nouveau_gpuobj_t *gpuobj, nouveau_gpuobj_ref_t **ref_ret) struct nouveau_gpuobj *gpuobj, struct nouveau_gpuobj_ref **ref_ret)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = NULL; struct nouveau_fifo *chan = NULL;
nouveau_gpuobj_ref_t *ref; struct nouveau_gpuobj_ref *ref;
uint32_t instance; uint32_t instance;
int ret; int ret;
@ -424,9 +424,9 @@ nouveau_gpuobj_ref_add(drm_device_t *dev, int channel, uint32_t handle,
return 0; return 0;
} }
int nouveau_gpuobj_ref_del(drm_device_t *dev, nouveau_gpuobj_ref_t **pref) int nouveau_gpuobj_ref_del(struct drm_device *dev, struct nouveau_gpuobj_ref **pref)
{ {
nouveau_gpuobj_ref_t *ref; struct nouveau_gpuobj_ref *ref;
DRM_DEBUG("ref %p\n", pref ? *pref : NULL); DRM_DEBUG("ref %p\n", pref ? *pref : NULL);
@ -452,11 +452,11 @@ int nouveau_gpuobj_ref_del(drm_device_t *dev, nouveau_gpuobj_ref_t **pref)
} }
int int
nouveau_gpuobj_new_ref(drm_device_t *dev, int oc, int rc, uint32_t handle, nouveau_gpuobj_new_ref(struct drm_device *dev, int oc, int rc, uint32_t handle,
int size, int align, uint32_t flags, int size, int align, uint32_t flags,
nouveau_gpuobj_ref_t **ref) struct nouveau_gpuobj_ref **ref)
{ {
nouveau_gpuobj_t *gpuobj = NULL; struct nouveau_gpuobj *gpuobj = NULL;
int ret; int ret;
if ((ret = nouveau_gpuobj_new(dev, oc, size, align, flags, &gpuobj))) if ((ret = nouveau_gpuobj_new(dev, oc, size, align, flags, &gpuobj)))
@ -471,12 +471,12 @@ nouveau_gpuobj_new_ref(drm_device_t *dev, int oc, int rc, uint32_t handle,
} }
static int static int
nouveau_gpuobj_ref_find(drm_device_t *dev, int channel, uint32_t handle, nouveau_gpuobj_ref_find(struct drm_device *dev, int channel, uint32_t handle,
nouveau_gpuobj_ref_t **ref_ret) struct nouveau_gpuobj_ref **ref_ret)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
nouveau_gpuobj_ref_t *ref = chan->ramht_refs; struct nouveau_gpuobj_ref *ref = chan->ramht_refs;
while (ref) { while (ref) {
if (ref->handle == handle) { if (ref->handle == handle) {
@ -491,12 +491,12 @@ nouveau_gpuobj_ref_find(drm_device_t *dev, int channel, uint32_t handle,
} }
int int
nouveau_gpuobj_new_fake(drm_device_t *dev, uint32_t offset, uint32_t size, nouveau_gpuobj_new_fake(struct drm_device *dev, uint32_t offset, uint32_t size,
uint32_t flags, nouveau_gpuobj_t **pgpuobj, uint32_t flags, struct nouveau_gpuobj **pgpuobj,
nouveau_gpuobj_ref_t **pref) struct nouveau_gpuobj_ref **pref)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
nouveau_gpuobj_t *gpuobj = NULL; struct nouveau_gpuobj *gpuobj = NULL;
int i; int i;
DRM_DEBUG("offset=0x%08x size=0x%08x flags=0x%08x\n", DRM_DEBUG("offset=0x%08x size=0x%08x flags=0x%08x\n",
@ -537,9 +537,9 @@ nouveau_gpuobj_new_fake(drm_device_t *dev, uint32_t offset, uint32_t size,
static int static int
nouveau_gpuobj_class_instmem_size(drm_device_t *dev, int class) nouveau_gpuobj_class_instmem_size(struct drm_device *dev, int class)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
/*XXX: dodgy hack for now */ /*XXX: dodgy hack for now */
if (dev_priv->card_type >= NV_50) if (dev_priv->card_type >= NV_50)
@ -577,11 +577,11 @@ nouveau_gpuobj_class_instmem_size(drm_device_t *dev, int class)
to it that can be used to set up context objects. to it that can be used to set up context objects.
*/ */
int int
nouveau_gpuobj_dma_new(drm_device_t *dev, int channel, int class, nouveau_gpuobj_dma_new(struct drm_device *dev, int channel, int class,
uint64_t offset, uint64_t size, int access, int target, uint64_t offset, uint64_t size, int access, int target,
nouveau_gpuobj_t **gpuobj) struct nouveau_gpuobj **gpuobj)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
int ret; int ret;
uint32_t is_scatter_gather = 0; uint32_t is_scatter_gather = 0;
@ -755,10 +755,10 @@ nouveau_gpuobj_dma_new(drm_device_t *dev, int channel, int class,
set to 0? set to 0?
*/ */
int int
nouveau_gpuobj_gr_new(drm_device_t *dev, int channel, int class, nouveau_gpuobj_gr_new(struct drm_device *dev, int channel, int class,
nouveau_gpuobj_t **gpuobj) struct nouveau_gpuobj **gpuobj)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
int ret; int ret;
DRM_DEBUG("ch%d class=0x%04x\n", channel, class); DRM_DEBUG("ch%d class=0x%04x\n", channel, class);
@ -804,11 +804,11 @@ nouveau_gpuobj_gr_new(drm_device_t *dev, int channel, int class,
} }
static int static int
nouveau_gpuobj_channel_init_pramin(drm_device_t *dev, int channel) nouveau_gpuobj_channel_init_pramin(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
nouveau_gpuobj_t *pramin = NULL; struct nouveau_gpuobj *pramin = NULL;
int size, base, ret; int size, base, ret;
DRM_DEBUG("ch%d\n", channel); DRM_DEBUG("ch%d\n", channel);
@ -854,12 +854,12 @@ nouveau_gpuobj_channel_init_pramin(drm_device_t *dev, int channel)
} }
int int
nouveau_gpuobj_channel_init(drm_device_t *dev, int channel, nouveau_gpuobj_channel_init(struct drm_device *dev, int channel,
uint32_t vram_h, uint32_t tt_h) uint32_t vram_h, uint32_t tt_h)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
nouveau_gpuobj_t *vram = NULL, *tt = NULL; struct nouveau_gpuobj *vram = NULL, *tt = NULL;
int ret; int ret;
DRM_DEBUG("ch%d vram=0x%08x tt=0x%08x\n", channel, vram_h, tt_h); DRM_DEBUG("ch%d vram=0x%08x tt=0x%08x\n", channel, vram_h, tt_h);
@ -940,11 +940,11 @@ nouveau_gpuobj_channel_init(drm_device_t *dev, int channel,
} }
void void
nouveau_gpuobj_channel_takedown(drm_device_t *dev, int channel) nouveau_gpuobj_channel_takedown(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
nouveau_gpuobj_ref_t *ref; struct nouveau_gpuobj_ref *ref;
DRM_DEBUG("ch%d\n", channel); DRM_DEBUG("ch%d\n", channel);
@ -964,12 +964,13 @@ nouveau_gpuobj_channel_takedown(drm_device_t *dev, int channel)
int nouveau_ioctl_grobj_alloc(DRM_IOCTL_ARGS) int nouveau_ioctl_grobj_alloc(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_nouveau_grobj_alloc_t init; struct drm_nouveau_grobj_alloc init;
nouveau_gpuobj_t *gr = NULL; struct nouveau_gpuobj *gr = NULL;
int ret; int ret;
DRM_COPY_FROM_USER_IOCTL(init, (drm_nouveau_grobj_alloc_t __user *) DRM_COPY_FROM_USER_IOCTL(init,
data, sizeof(init)); (struct drm_nouveau_grobj_alloc_t __user*)data,
sizeof(init));
if (!nouveau_fifo_owner(dev, filp, init.channel)) { if (!nouveau_fifo_owner(dev, filp, init.channel)) {
DRM_ERROR("pid %d doesn't own channel %d\n", DRM_ERROR("pid %d doesn't own channel %d\n",

50
shared-core/nouveau_state.c
View File

@ -28,9 +28,9 @@
#include "nouveau_drv.h" #include "nouveau_drv.h"
#include "nouveau_drm.h" #include "nouveau_drm.h"
static int nouveau_init_card_mappings(drm_device_t *dev) static int nouveau_init_card_mappings(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
int ret; int ret;
/* resource 0 is mmio regs */ /* resource 0 is mmio regs */
@ -86,11 +86,11 @@ static int nouveau_init_card_mappings(drm_device_t *dev)
return 0; return 0;
} }
static int nouveau_stub_init(drm_device_t *dev) { return 0; } static int nouveau_stub_init(struct drm_device *dev) { return 0; }
static void nouveau_stub_takedown(drm_device_t *dev) {} static void nouveau_stub_takedown(struct drm_device *dev) {}
static int nouveau_init_engine_ptrs(drm_device_t *dev) static int nouveau_init_engine_ptrs(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_engine_func *engine = &dev_priv->Engine; struct nouveau_engine_func *engine = &dev_priv->Engine;
switch (dev_priv->chipset & 0xf0) { switch (dev_priv->chipset & 0xf0) {
@ -259,9 +259,9 @@ static int nouveau_init_engine_ptrs(drm_device_t *dev)
return 0; return 0;
} }
static int nouveau_card_init(drm_device_t *dev) static int nouveau_card_init(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_engine_func *engine; struct nouveau_engine_func *engine;
int ret; int ret;
@ -321,10 +321,10 @@ static int nouveau_card_init(drm_device_t *dev)
return 0; return 0;
} }
static void nouveau_card_takedown(drm_device_t *dev) static void nouveau_card_takedown(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
nouveau_engine_func_t *engine = &dev_priv->Engine; struct nouveau_engine_func *engine = &dev_priv->Engine;
if (dev_priv->init_state != NOUVEAU_CARD_INIT_DOWN) { if (dev_priv->init_state != NOUVEAU_CARD_INIT_DOWN) {
engine->fifo.takedown(dev); engine->fifo.takedown(dev);
@ -341,9 +341,9 @@ static void nouveau_card_takedown(drm_device_t *dev)
} }
/* here a client dies, release the stuff that was allocated for its filp */ /* here a client dies, release the stuff that was allocated for its filp */
void nouveau_preclose(drm_device_t * dev, DRMFILE filp) void nouveau_preclose(struct drm_device *dev, DRMFILE filp)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
nouveau_fifo_cleanup(dev, filp); nouveau_fifo_cleanup(dev, filp);
nouveau_mem_release(filp,dev_priv->fb_heap); nouveau_mem_release(filp,dev_priv->fb_heap);
@ -367,7 +367,7 @@ int nouveau_firstopen(struct drm_device *dev)
int nouveau_load(struct drm_device *dev, unsigned long flags) int nouveau_load(struct drm_device *dev, unsigned long flags)
{ {
drm_nouveau_private_t *dev_priv; struct drm_nouveau_private *dev_priv;
if (flags==NV_UNKNOWN) if (flags==NV_UNKNOWN)
return DRM_ERR(EINVAL); return DRM_ERR(EINVAL);
@ -395,7 +395,7 @@ int nouveau_load(struct drm_device *dev, unsigned long flags)
void nouveau_lastclose(struct drm_device *dev) void nouveau_lastclose(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
nouveau_card_takedown(dev); nouveau_card_takedown(dev);
@ -416,10 +416,11 @@ int nouveau_unload(struct drm_device *dev)
int nouveau_ioctl_getparam(DRM_IOCTL_ARGS) int nouveau_ioctl_getparam(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
drm_nouveau_getparam_t getparam; struct drm_nouveau_getparam getparam;
DRM_COPY_FROM_USER_IOCTL(getparam, (drm_nouveau_getparam_t __user *)data, DRM_COPY_FROM_USER_IOCTL(getparam,
(struct drm_nouveau_getparam __user *)data,
sizeof(getparam)); sizeof(getparam));
switch (getparam.param) { switch (getparam.param) {
@ -463,18 +464,19 @@ int nouveau_ioctl_getparam(DRM_IOCTL_ARGS)
return DRM_ERR(EINVAL); return DRM_ERR(EINVAL);
} }
DRM_COPY_TO_USER_IOCTL((drm_nouveau_getparam_t __user *)data, getparam, DRM_COPY_TO_USER_IOCTL((struct drm_nouveau_getparam __user *)data,
sizeof(getparam)); getparam, sizeof(getparam));
return 0; return 0;
} }
int nouveau_ioctl_setparam(DRM_IOCTL_ARGS) int nouveau_ioctl_setparam(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
drm_nouveau_setparam_t setparam; struct drm_nouveau_setparam setparam;
DRM_COPY_FROM_USER_IOCTL(setparam, (drm_nouveau_setparam_t __user *)data, DRM_COPY_FROM_USER_IOCTL(setparam,
(struct drm_nouveau_setparam __user *)data,
sizeof(setparam)); sizeof(setparam));
switch (setparam.param) { switch (setparam.param) {
@ -506,7 +508,7 @@ int nouveau_ioctl_setparam(DRM_IOCTL_ARGS)
/* waits for idle */ /* waits for idle */
void nouveau_wait_for_idle(struct drm_device *dev) void nouveau_wait_for_idle(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv=dev->dev_private; struct drm_nouveau_private *dev_priv=dev->dev_private;
switch(dev_priv->card_type) switch(dev_priv->card_type)
{ {
case NV_03: case NV_03:

6
shared-core/nv04_fb.c
View File

@ -4,9 +4,9 @@
#include "nouveau_drm.h" #include "nouveau_drm.h"
int int
nv04_fb_init(drm_device_t *dev) nv04_fb_init(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
/* This is what the DDX did for NV_ARCH_04, but a mmio-trace shows /* This is what the DDX did for NV_ARCH_04, but a mmio-trace shows
* nvidia reading PFB_CFG_0, then writing back its original value. * nvidia reading PFB_CFG_0, then writing back its original value.
@ -18,7 +18,7 @@ nv04_fb_init(drm_device_t *dev)
} }
void void
nv04_fb_takedown(drm_device_t *dev) nv04_fb_takedown(struct drm_device *dev)
{ {
} }

16
shared-core/nv04_fifo.c
View File

@ -36,9 +36,9 @@
#define NV04_RAMFC__SIZE 32 #define NV04_RAMFC__SIZE 32
int int
nv04_fifo_create_context(drm_device_t *dev, int channel) nv04_fifo_create_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
int ret; int ret;
@ -67,9 +67,9 @@ nv04_fifo_create_context(drm_device_t *dev, int channel)
} }
void void
nv04_fifo_destroy_context(drm_device_t *dev, int channel) nv04_fifo_destroy_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
NV_WRITE(NV04_PFIFO_MODE, NV_READ(NV04_PFIFO_MODE)&~(1<<channel)); NV_WRITE(NV04_PFIFO_MODE, NV_READ(NV04_PFIFO_MODE)&~(1<<channel));
@ -79,9 +79,9 @@ nv04_fifo_destroy_context(drm_device_t *dev, int channel)
} }
int int
nv04_fifo_load_context(drm_device_t *dev, int channel) nv04_fifo_load_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
uint32_t tmp; uint32_t tmp;
@ -107,9 +107,9 @@ nv04_fifo_load_context(drm_device_t *dev, int channel)
} }
int int
nv04_fifo_save_context(drm_device_t *dev, int channel) nv04_fifo_save_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
uint32_t tmp; uint32_t tmp;

20
shared-core/nv04_graph.c
View File

@ -287,9 +287,9 @@ struct reg_interval
}; };
void nouveau_nv04_context_switch(drm_device_t *dev) void nouveau_nv04_context_switch(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
int channel, channel_old, i, j, index; int channel, channel_old, i, j, index;
channel=NV_READ(NV03_PFIFO_CACHE1_PUSH1)&(nouveau_fifo_number(dev)-1); channel=NV_READ(NV03_PFIFO_CACHE1_PUSH1)&(nouveau_fifo_number(dev)-1);
@ -336,8 +336,8 @@ void nouveau_nv04_context_switch(drm_device_t *dev)
NV_WRITE(NV04_PGRAPH_FIFO,0x1); NV_WRITE(NV04_PGRAPH_FIFO,0x1);
} }
int nv04_graph_create_context(drm_device_t *dev, int channel) { int nv04_graph_create_context(struct drm_device *dev, int channel) {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
DRM_DEBUG("nv04_graph_context_create %d\n", channel); DRM_DEBUG("nv04_graph_context_create %d\n", channel);
memset(dev_priv->fifos[channel]->pgraph_ctx, 0, sizeof(dev_priv->fifos[channel]->pgraph_ctx)); memset(dev_priv->fifos[channel]->pgraph_ctx, 0, sizeof(dev_priv->fifos[channel]->pgraph_ctx));
@ -351,24 +351,24 @@ int nv04_graph_create_context(drm_device_t *dev, int channel) {
return 0; return 0;
} }
void nv04_graph_destroy_context(drm_device_t *dev, int channel) void nv04_graph_destroy_context(struct drm_device *dev, int channel)
{ {
} }
int nv04_graph_load_context(drm_device_t *dev, int channel) int nv04_graph_load_context(struct drm_device *dev, int channel)
{ {
DRM_ERROR("stub!\n"); DRM_ERROR("stub!\n");
return 0; return 0;
} }
int nv04_graph_save_context(drm_device_t *dev, int channel) int nv04_graph_save_context(struct drm_device *dev, int channel)
{ {
DRM_ERROR("stub!\n"); DRM_ERROR("stub!\n");
return 0; return 0;
} }
int nv04_graph_init(drm_device_t *dev) { int nv04_graph_init(struct drm_device *dev) {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
int i,sum=0; int i,sum=0;
NV_WRITE(NV03_PMC_ENABLE, NV_READ(NV03_PMC_ENABLE) & NV_WRITE(NV03_PMC_ENABLE, NV_READ(NV03_PMC_ENABLE) &
@ -406,7 +406,7 @@ int nv04_graph_init(drm_device_t *dev) {
return 0; return 0;
} }
void nv04_graph_takedown(drm_device_t *dev) void nv04_graph_takedown(struct drm_device *dev)
{ {
} }

20
shared-core/nv04_instmem.c
View File

@ -5,7 +5,7 @@
static void static void
nv04_instmem_determine_amount(struct drm_device *dev) nv04_instmem_determine_amount(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
int i; int i;
/* Figure out how much instance memory we need */ /* Figure out how much instance memory we need */
@ -35,7 +35,7 @@ nv04_instmem_determine_amount(struct drm_device *dev)
static void static void
nv04_instmem_configure_fixed_tables(struct drm_device *dev) nv04_instmem_configure_fixed_tables(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
/* FIFO hash table (RAMHT) /* FIFO hash table (RAMHT)
* use 4k hash table at RAMIN+0x10000 * use 4k hash table at RAMIN+0x10000
@ -85,7 +85,7 @@ nv04_instmem_configure_fixed_tables(struct drm_device *dev)
int nv04_instmem_init(struct drm_device *dev) int nv04_instmem_init(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
uint32_t offset; uint32_t offset;
int ret = 0; int ret = 0;
@ -114,15 +114,15 @@ int nv04_instmem_init(struct drm_device *dev)
} }
void void
nv04_instmem_takedown(drm_device_t *dev) nv04_instmem_takedown(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
nouveau_gpuobj_del(dev, &dev_priv->ramht); nouveau_gpuobj_del(dev, &dev_priv->ramht);
} }
int int
nv04_instmem_populate(drm_device_t *dev, nouveau_gpuobj_t *gpuobj, uint32_t *sz) nv04_instmem_populate(struct drm_device *dev, struct nouveau_gpuobj *gpuobj, uint32_t *sz)
{ {
if (gpuobj->im_backing) if (gpuobj->im_backing)
return DRM_ERR(EINVAL); return DRM_ERR(EINVAL);
@ -131,9 +131,9 @@ nv04_instmem_populate(drm_device_t *dev, nouveau_gpuobj_t *gpuobj, uint32_t *sz)
} }
void void
nv04_instmem_clear(drm_device_t *dev, nouveau_gpuobj_t *gpuobj) nv04_instmem_clear(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
if (gpuobj && gpuobj->im_backing) { if (gpuobj && gpuobj->im_backing) {
if (gpuobj->im_bound) if (gpuobj->im_bound)
@ -144,7 +144,7 @@ nv04_instmem_clear(drm_device_t *dev, nouveau_gpuobj_t *gpuobj)
} }
int int
nv04_instmem_bind(drm_device_t *dev, nouveau_gpuobj_t *gpuobj) nv04_instmem_bind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
{ {
if (!gpuobj->im_pramin || gpuobj->im_bound) if (!gpuobj->im_pramin || gpuobj->im_bound)
return DRM_ERR(EINVAL); return DRM_ERR(EINVAL);
@ -154,7 +154,7 @@ nv04_instmem_bind(drm_device_t *dev, nouveau_gpuobj_t *gpuobj)
} }
int int
nv04_instmem_unbind(drm_device_t *dev, nouveau_gpuobj_t *gpuobj) nv04_instmem_unbind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
{ {
if (gpuobj->im_bound == 0) if (gpuobj->im_bound == 0)
return DRM_ERR(EINVAL); return DRM_ERR(EINVAL);

6
shared-core/nv04_mc.c
View File

@ -4,9 +4,9 @@
#include "nouveau_drm.h" #include "nouveau_drm.h"
int int
nv04_mc_init(drm_device_t *dev) nv04_mc_init(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
/* Power up everything, resetting each individual unit will /* Power up everything, resetting each individual unit will
* be done later if needed. * be done later if needed.
@ -19,7 +19,7 @@ nv04_mc_init(drm_device_t *dev)
} }
void void
nv04_mc_takedown(drm_device_t *dev) nv04_mc_takedown(struct drm_device *dev)
{ {
} }

6
shared-core/nv04_timer.c
View File

@ -4,9 +4,9 @@
#include "nouveau_drm.h" #include "nouveau_drm.h"
int int
nv04_timer_init(drm_device_t *dev) nv04_timer_init(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
NV_WRITE(NV04_PTIMER_INTR_EN_0, 0x00000000); NV_WRITE(NV04_PTIMER_INTR_EN_0, 0x00000000);
NV_WRITE(NV04_PTIMER_INTR_0, 0xFFFFFFFF); NV_WRITE(NV04_PTIMER_INTR_0, 0xFFFFFFFF);
@ -18,7 +18,7 @@ nv04_timer_init(drm_device_t *dev)
} }
void void
nv04_timer_takedown(drm_device_t *dev) nv04_timer_takedown(struct drm_device *dev)
{ {
} }

6
shared-core/nv10_fb.c
View File

@ -4,9 +4,9 @@
#include "nouveau_drm.h" #include "nouveau_drm.h"
int int
nv10_fb_init(drm_device_t *dev) nv10_fb_init(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
uint32_t fb_bar_size; uint32_t fb_bar_size;
int i; int i;
@ -20,7 +20,7 @@ nv10_fb_init(drm_device_t *dev)
} }
void void
nv10_fb_takedown(drm_device_t *dev) nv10_fb_takedown(struct drm_device *dev)
{ {
} }

16
shared-core/nv10_fifo.c
View File

@ -37,9 +37,9 @@
#define NV10_RAMFC__SIZE ((dev_priv->chipset) >= 0x17 ? 64 : 32) #define NV10_RAMFC__SIZE ((dev_priv->chipset) >= 0x17 ? 64 : 32)
int int
nv10_fifo_create_context(drm_device_t *dev, int channel) nv10_fifo_create_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
int ret; int ret;
@ -70,9 +70,9 @@ nv10_fifo_create_context(drm_device_t *dev, int channel)
} }
void void
nv10_fifo_destroy_context(drm_device_t *dev, int channel) nv10_fifo_destroy_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
NV_WRITE(NV04_PFIFO_MODE, NV_READ(NV04_PFIFO_MODE)&~(1<<channel)); NV_WRITE(NV04_PFIFO_MODE, NV_READ(NV04_PFIFO_MODE)&~(1<<channel));
@ -82,9 +82,9 @@ nv10_fifo_destroy_context(drm_device_t *dev, int channel)
} }
int int
nv10_fifo_load_context(drm_device_t *dev, int channel) nv10_fifo_load_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
uint32_t tmp; uint32_t tmp;
@ -124,9 +124,9 @@ nv10_fifo_load_context(drm_device_t *dev, int channel)
} }
int int
nv10_fifo_save_context(drm_device_t *dev, int channel) nv10_fifo_save_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
uint32_t tmp; uint32_t tmp;

32
shared-core/nv10_graph.c
View File

@ -28,8 +28,8 @@
#include "nouveau_drv.h" #include "nouveau_drv.h"
static void nv10_praph_pipe(drm_device_t *dev) { static void nv10_praph_pipe(struct drm_device *dev) {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
int i; int i;
nouveau_wait_for_idle(dev); nouveau_wait_for_idle(dev);
@ -527,9 +527,9 @@ NV10_PGRAPH_DEBUG_4,
0x00400a04, 0x00400a04,
}; };
static int nv10_graph_ctx_regs_find_offset(drm_device_t *dev, int reg) static int nv10_graph_ctx_regs_find_offset(struct drm_device *dev, int reg)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
int i, j; int i, j;
for (i = 0; i < sizeof(nv10_graph_ctx_regs)/sizeof(nv10_graph_ctx_regs[0]); i++) { for (i = 0; i < sizeof(nv10_graph_ctx_regs)/sizeof(nv10_graph_ctx_regs[0]); i++) {
if (nv10_graph_ctx_regs[i] == reg) if (nv10_graph_ctx_regs[i] == reg)
@ -544,9 +544,9 @@ static int nv10_graph_ctx_regs_find_offset(drm_device_t *dev, int reg)
return -1; return -1;
} }
static void restore_ctx_regs(drm_device_t *dev, int channel) static void restore_ctx_regs(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *fifo = dev_priv->fifos[channel]; struct nouveau_fifo *fifo = dev_priv->fifos[channel];
int i, j; int i, j;
for (i = 0; i < sizeof(nv10_graph_ctx_regs)/sizeof(nv10_graph_ctx_regs[0]); i++) for (i = 0; i < sizeof(nv10_graph_ctx_regs)/sizeof(nv10_graph_ctx_regs[0]); i++)
@ -558,9 +558,9 @@ static void restore_ctx_regs(drm_device_t *dev, int channel)
nouveau_wait_for_idle(dev); nouveau_wait_for_idle(dev);
} }
void nouveau_nv10_context_switch(drm_device_t *dev) void nouveau_nv10_context_switch(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
int channel, channel_old, i, j; int channel, channel_old, i, j;
channel=NV_READ(NV03_PFIFO_CACHE1_PUSH1)&(nouveau_fifo_number(dev)-1); channel=NV_READ(NV03_PFIFO_CACHE1_PUSH1)&(nouveau_fifo_number(dev)-1);
@ -611,8 +611,8 @@ void nouveau_nv10_context_switch(drm_device_t *dev)
if (offset > 0) \ if (offset > 0) \
fifo->pgraph_ctx[offset] = val; \ fifo->pgraph_ctx[offset] = val; \
} while (0) } while (0)
int nv10_graph_create_context(drm_device_t *dev, int channel) { int nv10_graph_create_context(struct drm_device *dev, int channel) {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *fifo = dev_priv->fifos[channel]; struct nouveau_fifo *fifo = dev_priv->fifos[channel];
uint32_t tmp, vramsz; uint32_t tmp, vramsz;
@ -663,24 +663,24 @@ int nv10_graph_create_context(drm_device_t *dev, int channel) {
return 0; return 0;
} }
void nv10_graph_destroy_context(drm_device_t *dev, int channel) void nv10_graph_destroy_context(struct drm_device *dev, int channel)
{ {
} }
int nv10_graph_load_context(drm_device_t *dev, int channel) int nv10_graph_load_context(struct drm_device *dev, int channel)
{ {
DRM_ERROR("stub!\n"); DRM_ERROR("stub!\n");
return 0; return 0;
} }
int nv10_graph_save_context(drm_device_t *dev, int channel) int nv10_graph_save_context(struct drm_device *dev, int channel)
{ {
DRM_ERROR("stub!\n"); DRM_ERROR("stub!\n");
return 0; return 0;
} }
int nv10_graph_init(drm_device_t *dev) { int nv10_graph_init(struct drm_device *dev) {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
int i; int i;
NV_WRITE(NV03_PMC_ENABLE, NV_READ(NV03_PMC_ENABLE) & NV_WRITE(NV03_PMC_ENABLE, NV_READ(NV03_PMC_ENABLE) &
@ -714,7 +714,7 @@ int nv10_graph_init(drm_device_t *dev) {
return 0; return 0;
} }
void nv10_graph_takedown(drm_device_t *dev) void nv10_graph_takedown(struct drm_device *dev)
{ {
} }

40
shared-core/nv20_graph.c
View File

@ -29,9 +29,9 @@
#define NV20_GRCTX_SIZE (3529*4) #define NV20_GRCTX_SIZE (3529*4)
int nv20_graph_create_context(drm_device_t *dev, int channel) { int nv20_graph_create_context(struct drm_device *dev, int channel) {
drm_nouveau_private_t *dev_priv = struct drm_nouveau_private *dev_priv =
(drm_nouveau_private_t *)dev->dev_private; (struct drm_nouveau_private *)dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
unsigned int ctx_size = NV20_GRCTX_SIZE; unsigned int ctx_size = NV20_GRCTX_SIZE;
int ret; int ret;
@ -49,8 +49,8 @@ int nv20_graph_create_context(drm_device_t *dev, int channel) {
return 0; return 0;
} }
void nv20_graph_destroy_context(drm_device_t *dev, int channel) { void nv20_graph_destroy_context(struct drm_device *dev, int channel) {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
if (chan->ramin_grctx) if (chan->ramin_grctx)
@ -59,9 +59,9 @@ void nv20_graph_destroy_context(drm_device_t *dev, int channel) {
INSTANCE_WR(dev_priv->ctx_table->gpuobj, channel, 0); INSTANCE_WR(dev_priv->ctx_table->gpuobj, channel, 0);
} }
static void nv20_graph_rdi(drm_device_t *dev) { static void nv20_graph_rdi(struct drm_device *dev) {
drm_nouveau_private_t *dev_priv = struct drm_nouveau_private *dev_priv =
(drm_nouveau_private_t *)dev->dev_private; (struct drm_nouveau_private *)dev->dev_private;
int i; int i;
NV_WRITE(NV10_PGRAPH_RDI_INDEX, 0x2c80000); NV_WRITE(NV10_PGRAPH_RDI_INDEX, 0x2c80000);
@ -73,9 +73,9 @@ static void nv20_graph_rdi(drm_device_t *dev) {
/* Save current context (from PGRAPH) into the channel's context /* Save current context (from PGRAPH) into the channel's context
*/ */
int nv20_graph_save_context(drm_device_t *dev, int channel) { int nv20_graph_save_context(struct drm_device *dev, int channel) {
drm_nouveau_private_t *dev_priv = struct drm_nouveau_private *dev_priv =
(drm_nouveau_private_t *)dev->dev_private; (struct drm_nouveau_private *)dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
uint32_t instance; uint32_t instance;
@ -94,9 +94,9 @@ int nv20_graph_save_context(drm_device_t *dev, int channel) {
/* Restore the context for a specific channel into PGRAPH /* Restore the context for a specific channel into PGRAPH
*/ */
int nv20_graph_load_context(drm_device_t *dev, int channel) { int nv20_graph_load_context(struct drm_device *dev, int channel) {
drm_nouveau_private_t *dev_priv = struct drm_nouveau_private *dev_priv =
(drm_nouveau_private_t *)dev->dev_private; (struct drm_nouveau_private *)dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
uint32_t instance; uint32_t instance;
@ -113,9 +113,9 @@ int nv20_graph_load_context(drm_device_t *dev, int channel) {
return 0; return 0;
} }
void nouveau_nv20_context_switch(drm_device_t *dev) void nouveau_nv20_context_switch(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
int channel, channel_old; int channel, channel_old;
channel=NV_READ(NV03_PFIFO_CACHE1_PUSH1)&(nouveau_fifo_number(dev)-1); channel=NV_READ(NV03_PFIFO_CACHE1_PUSH1)&(nouveau_fifo_number(dev)-1);
@ -144,9 +144,9 @@ void nouveau_nv20_context_switch(drm_device_t *dev)
NV_WRITE(NV04_PGRAPH_FIFO,0x1); NV_WRITE(NV04_PGRAPH_FIFO,0x1);
} }
int nv20_graph_init(drm_device_t *dev) { int nv20_graph_init(struct drm_device *dev) {
drm_nouveau_private_t *dev_priv = struct drm_nouveau_private *dev_priv =
(drm_nouveau_private_t *)dev->dev_private; (struct drm_nouveau_private *)dev->dev_private;
uint32_t tmp, vramsz; uint32_t tmp, vramsz;
int ret, i; int ret, i;
@ -240,7 +240,7 @@ int nv20_graph_init(drm_device_t *dev) {
return 0; return 0;
} }
void nv20_graph_takedown(drm_device_t *dev) void nv20_graph_takedown(struct drm_device *dev)
{ {
} }

38
shared-core/nv30_graph.c
View File

@ -16,9 +16,9 @@
* contexts are taken from dumps just after the 3D object is * contexts are taken from dumps just after the 3D object is
* created. * created.
*/ */
static void nv30_graph_context_init(drm_device_t *dev, nouveau_gpuobj_t *ctx) static void nv30_graph_context_init(struct drm_device *dev, struct nouveau_gpuobj *ctx)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
int i; int i;
INSTANCE_WR(ctx, 0x28/4, 0x10000000); INSTANCE_WR(ctx, 0x28/4, 0x10000000);
@ -100,12 +100,12 @@ static void nv30_graph_context_init(drm_device_t *dev, nouveau_gpuobj_t *ctx)
} }
int nv30_graph_create_context(drm_device_t *dev, int channel) int nv30_graph_create_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = struct drm_nouveau_private *dev_priv =
(drm_nouveau_private_t *)dev->dev_private; (struct drm_nouveau_private *)dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
void (*ctx_init)(drm_device_t *, nouveau_gpuobj_t *); void (*ctx_init)(struct drm_device *, struct nouveau_gpuobj *);
unsigned int ctx_size; unsigned int ctx_size;
int ret; int ret;
@ -131,10 +131,10 @@ int nv30_graph_create_context(drm_device_t *dev, int channel)
return 0; return 0;
} }
void nv30_graph_destroy_context(drm_device_t *dev, int channel) void nv30_graph_destroy_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = struct drm_nouveau_private *dev_priv =
(drm_nouveau_private_t *)dev->dev_private; (struct drm_nouveau_private *)dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
if (chan->ramin_grctx) if (chan->ramin_grctx)
@ -144,9 +144,9 @@ void nv30_graph_destroy_context(drm_device_t *dev, int channel)
} }
static int static int
nouveau_graph_wait_idle(drm_device_t *dev) nouveau_graph_wait_idle(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
int tv = 1000; int tv = 1000;
while (tv--) { while (tv--) {
@ -161,9 +161,9 @@ nouveau_graph_wait_idle(drm_device_t *dev)
return 0; return 0;
} }
int nv30_graph_load_context(drm_device_t *dev, int channel) int nv30_graph_load_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
uint32_t inst; uint32_t inst;
@ -178,9 +178,9 @@ int nv30_graph_load_context(drm_device_t *dev, int channel)
return nouveau_graph_wait_idle(dev); return nouveau_graph_wait_idle(dev);
} }
int nv30_graph_save_context(drm_device_t *dev, int channel) int nv30_graph_save_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
uint32_t inst; uint32_t inst;
@ -195,10 +195,10 @@ int nv30_graph_save_context(drm_device_t *dev, int channel)
return nouveau_graph_wait_idle(dev); return nouveau_graph_wait_idle(dev);
} }
int nv30_graph_init(drm_device_t *dev) int nv30_graph_init(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = struct drm_nouveau_private *dev_priv =
(drm_nouveau_private_t *)dev->dev_private; (struct drm_nouveau_private *)dev->dev_private;
uint32_t vramsz, tmp; uint32_t vramsz, tmp;
int ret, i; int ret, i;
@ -279,7 +279,7 @@ int nv30_graph_init(drm_device_t *dev)
return 0; return 0;
} }
void nv30_graph_takedown(drm_device_t *dev) void nv30_graph_takedown(struct drm_device *dev)
{ {
} }

6
shared-core/nv40_fb.c
View File

@ -4,9 +4,9 @@
#include "nouveau_drm.h" #include "nouveau_drm.h"
int int
nv40_fb_init(drm_device_t *dev) nv40_fb_init(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
uint32_t fb_bar_size, tmp; uint32_t fb_bar_size, tmp;
int num_tiles; int num_tiles;
int i; int i;
@ -50,7 +50,7 @@ nv40_fb_init(drm_device_t *dev)
} }
void void
nv40_fb_takedown(drm_device_t *dev) nv40_fb_takedown(struct drm_device *dev)
{ {
} }

16
shared-core/nv40_fifo.c
View File

@ -37,9 +37,9 @@
#define NV40_RAMFC__SIZE 128 #define NV40_RAMFC__SIZE 128
int int
nv40_fifo_create_context(drm_device_t *dev, int channel) nv40_fifo_create_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
int ret; int ret;
@ -73,9 +73,9 @@ nv40_fifo_create_context(drm_device_t *dev, int channel)
} }
void void
nv40_fifo_destroy_context(drm_device_t *dev, int channel) nv40_fifo_destroy_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
NV_WRITE(NV04_PFIFO_MODE, NV_READ(NV04_PFIFO_MODE)&~(1<<channel)); NV_WRITE(NV04_PFIFO_MODE, NV_READ(NV04_PFIFO_MODE)&~(1<<channel));
@ -85,9 +85,9 @@ nv40_fifo_destroy_context(drm_device_t *dev, int channel)
} }
int int
nv40_fifo_load_context(drm_device_t *dev, int channel) nv40_fifo_load_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
uint32_t tmp, tmp2; uint32_t tmp, tmp2;
@ -144,9 +144,9 @@ nv40_fifo_load_context(drm_device_t *dev, int channel)
} }
int int
nv40_fifo_save_context(drm_device_t *dev, int channel) nv40_fifo_save_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
uint32_t tmp; uint32_t tmp;

64
shared-core/nv40_graph.c
View File

@ -47,9 +47,9 @@
* created. * created.
*/ */
static void static void
nv40_graph_context_init(drm_device_t *dev, nouveau_gpuobj_t *ctx) nv40_graph_context_init(struct drm_device *dev, struct nouveau_gpuobj *ctx)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
int i; int i;
/* Always has the "instance address" of itself at offset 0 */ /* Always has the "instance address" of itself at offset 0 */
@ -188,9 +188,9 @@ nv40_graph_context_init(drm_device_t *dev, nouveau_gpuobj_t *ctx)
} }
static void static void
nv43_graph_context_init(drm_device_t *dev, nouveau_gpuobj_t *ctx) nv43_graph_context_init(struct drm_device *dev, struct nouveau_gpuobj *ctx)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
int i; int i;
INSTANCE_WR(ctx, 0x00000/4, ctx->im_pramin->start); INSTANCE_WR(ctx, 0x00000/4, ctx->im_pramin->start);
@ -304,9 +304,9 @@ nv43_graph_context_init(drm_device_t *dev, nouveau_gpuobj_t *ctx)
}; };
static void static void
nv46_graph_context_init(drm_device_t *dev, nouveau_gpuobj_t *ctx) nv46_graph_context_init(struct drm_device *dev, struct nouveau_gpuobj *ctx)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
int i; int i;
INSTANCE_WR(ctx, 0x00000/4, ctx->im_pramin->start); INSTANCE_WR(ctx, 0x00000/4, ctx->im_pramin->start);
@ -455,9 +455,9 @@ nv46_graph_context_init(drm_device_t *dev, nouveau_gpuobj_t *ctx)
} }
static void static void
nv49_graph_context_init(drm_device_t *dev, nouveau_gpuobj_t *ctx) nv49_graph_context_init(struct drm_device *dev, struct nouveau_gpuobj *ctx)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
int i; int i;
INSTANCE_WR(ctx, 0x00000/4, ctx->im_pramin->start); INSTANCE_WR(ctx, 0x00000/4, ctx->im_pramin->start);
@ -678,9 +678,9 @@ nv49_graph_context_init(drm_device_t *dev, nouveau_gpuobj_t *ctx)
} }
static void static void
nv4a_graph_context_init(drm_device_t *dev, nouveau_gpuobj_t *ctx) nv4a_graph_context_init(struct drm_device *dev, struct nouveau_gpuobj *ctx)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
int i; int i;
INSTANCE_WR(ctx, 0x00000/4, ctx->im_pramin->start); INSTANCE_WR(ctx, 0x00000/4, ctx->im_pramin->start);
@ -795,9 +795,9 @@ nv4a_graph_context_init(drm_device_t *dev, nouveau_gpuobj_t *ctx)
} }
static void static void
nv4b_graph_context_init(drm_device_t *dev, nouveau_gpuobj_t *ctx) nv4b_graph_context_init(struct drm_device *dev, struct nouveau_gpuobj *ctx)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
int i; int i;
INSTANCE_WR(ctx, 0x00000/4, ctx->im_pramin->start); INSTANCE_WR(ctx, 0x00000/4, ctx->im_pramin->start);
@ -1010,9 +1010,9 @@ nv4b_graph_context_init(drm_device_t *dev, nouveau_gpuobj_t *ctx)
} }
static void static void
nv4c_graph_context_init(drm_device_t *dev, nouveau_gpuobj_t *ctx) nv4c_graph_context_init(struct drm_device *dev, struct nouveau_gpuobj *ctx)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
int i; int i;
INSTANCE_WR(ctx, 0x00000/4, ctx->im_pramin->start); INSTANCE_WR(ctx, 0x00000/4, ctx->im_pramin->start);
@ -1117,9 +1117,9 @@ nv4c_graph_context_init(drm_device_t *dev, nouveau_gpuobj_t *ctx)
} }
static void static void
nv4e_graph_context_init(drm_device_t *dev, nouveau_gpuobj_t *ctx) nv4e_graph_context_init(struct drm_device *dev, struct nouveau_gpuobj *ctx)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
int i; int i;
INSTANCE_WR(ctx, 0x00000/4, ctx->im_pramin->start); INSTANCE_WR(ctx, 0x00000/4, ctx->im_pramin->start);
@ -1224,12 +1224,12 @@ nv4e_graph_context_init(drm_device_t *dev, nouveau_gpuobj_t *ctx)
} }
int int
nv40_graph_create_context(drm_device_t *dev, int channel) nv40_graph_create_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = struct drm_nouveau_private *dev_priv =
(drm_nouveau_private_t *)dev->dev_private; (struct drm_nouveau_private *)dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
void (*ctx_init)(drm_device_t *, nouveau_gpuobj_t *); void (*ctx_init)(struct drm_device *, struct nouveau_gpuobj *);
unsigned int ctx_size; unsigned int ctx_size;
int ret; int ret;
@ -1284,9 +1284,9 @@ nv40_graph_create_context(drm_device_t *dev, int channel)
} }
void void
nv40_graph_destroy_context(drm_device_t *dev, int channel) nv40_graph_destroy_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
if (chan->ramin_grctx) if (chan->ramin_grctx)
@ -1294,9 +1294,9 @@ nv40_graph_destroy_context(drm_device_t *dev, int channel)
} }
static int static int
nv40_graph_transfer_context(drm_device_t *dev, uint32_t inst, int save) nv40_graph_transfer_context(struct drm_device *dev, uint32_t inst, int save)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
uint32_t old_cp, tv = 1000; uint32_t old_cp, tv = 1000;
int i; int i;
@ -1327,9 +1327,9 @@ nv40_graph_transfer_context(drm_device_t *dev, uint32_t inst, int save)
*XXX: fails sometimes, not sure why.. *XXX: fails sometimes, not sure why..
*/ */
int int
nv40_graph_save_context(drm_device_t *dev, int channel) nv40_graph_save_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
uint32_t inst; uint32_t inst;
@ -1344,9 +1344,9 @@ nv40_graph_save_context(drm_device_t *dev, int channel)
* XXX: fails sometimes.. not sure why * XXX: fails sometimes.. not sure why
*/ */
int int
nv40_graph_load_context(drm_device_t *dev, int channel) nv40_graph_load_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
uint32_t inst; uint32_t inst;
int ret; int ret;
@ -1599,10 +1599,10 @@ static uint32_t nv4e_ctx_voodoo[] = {
* C51 0x4e * C51 0x4e
*/ */
int int
nv40_graph_init(drm_device_t *dev) nv40_graph_init(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = struct drm_nouveau_private *dev_priv =
(drm_nouveau_private_t *)dev->dev_private; (struct drm_nouveau_private *)dev->dev_private;
uint32_t *ctx_voodoo; uint32_t *ctx_voodoo;
uint32_t vramsz, tmp; uint32_t vramsz, tmp;
int i, j; int i, j;
@ -1829,7 +1829,7 @@ nv40_graph_init(drm_device_t *dev)
return 0; return 0;
} }
void nv40_graph_takedown(drm_device_t *dev) void nv40_graph_takedown(struct drm_device *dev)
{ {
} }

6
shared-core/nv40_mc.c
View File

@ -4,9 +4,9 @@
#include "nouveau_drm.h" #include "nouveau_drm.h"
int int
nv40_mc_init(drm_device_t *dev) nv40_mc_init(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
uint32_t tmp; uint32_t tmp;
/* Power up everything, resetting each individual unit will /* Power up everything, resetting each individual unit will
@ -35,7 +35,7 @@ nv40_mc_init(drm_device_t *dev)
} }
void void
nv40_mc_takedown(drm_device_t *dev) nv40_mc_takedown(struct drm_device *dev)
{ {
} }

58
shared-core/nv50_fifo.c
View File

@ -29,18 +29,18 @@
#include "nouveau_drv.h" #include "nouveau_drv.h"
typedef struct { typedef struct {
nouveau_gpuobj_ref_t *thingo; struct nouveau_gpuobj_ref *thingo;
nouveau_gpuobj_ref_t *dummyctx; struct nouveau_gpuobj_ref *dummyctx;
} nv50_fifo_priv; } nv50_fifo_priv;
#define IS_G80 ((dev_priv->chipset & 0xf0) == 0x50) #define IS_G80 ((dev_priv->chipset & 0xf0) == 0x50)
static void static void
nv50_fifo_init_thingo(drm_device_t *dev) nv50_fifo_init_thingo(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
nv50_fifo_priv *priv = dev_priv->Engine.fifo.priv; nv50_fifo_priv *priv = dev_priv->Engine.fifo.priv;
nouveau_gpuobj_ref_t *thingo = priv->thingo; struct nouveau_gpuobj_ref *thingo = priv->thingo;
int i, fi=2; int i, fi=2;
DRM_DEBUG("\n"); DRM_DEBUG("\n");
@ -60,9 +60,9 @@ nv50_fifo_init_thingo(drm_device_t *dev)
} }
static int static int
nv50_fifo_channel_enable(drm_device_t *dev, int channel) nv50_fifo_channel_enable(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
DRM_DEBUG("ch%d\n", channel); DRM_DEBUG("ch%d\n", channel);
@ -88,9 +88,9 @@ nv50_fifo_channel_enable(drm_device_t *dev, int channel)
} }
static void static void
nv50_fifo_channel_disable(drm_device_t *dev, int channel, int nt) nv50_fifo_channel_disable(struct drm_device *dev, int channel, int nt)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
DRM_DEBUG("ch%d, nt=%d\n", channel, nt); DRM_DEBUG("ch%d, nt=%d\n", channel, nt);
@ -106,9 +106,9 @@ nv50_fifo_channel_disable(drm_device_t *dev, int channel, int nt)
} }
static void static void
nv50_fifo_init_reset(drm_device_t *dev) nv50_fifo_init_reset(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
uint32_t pmc_e; uint32_t pmc_e;
DRM_DEBUG("\n"); DRM_DEBUG("\n");
@ -120,7 +120,7 @@ nv50_fifo_init_reset(drm_device_t *dev)
} }
static void static void
nv50_fifo_init_context_table(drm_device_t *dev) nv50_fifo_init_context_table(struct drm_device *dev)
{ {
int i; int i;
@ -132,9 +132,9 @@ nv50_fifo_init_context_table(drm_device_t *dev)
} }
static void static void
nv50_fifo_init_regs__nv(drm_device_t *dev) nv50_fifo_init_regs__nv(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
DRM_DEBUG("\n"); DRM_DEBUG("\n");
@ -142,9 +142,9 @@ nv50_fifo_init_regs__nv(drm_device_t *dev)
} }
static int static int
nv50_fifo_init_regs(drm_device_t *dev) nv50_fifo_init_regs(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
nv50_fifo_priv *priv = dev_priv->Engine.fifo.priv; nv50_fifo_priv *priv = dev_priv->Engine.fifo.priv;
int ret; int ret;
@ -176,9 +176,9 @@ nv50_fifo_init_regs(drm_device_t *dev)
} }
int int
nv50_fifo_init(drm_device_t *dev) nv50_fifo_init(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
nv50_fifo_priv *priv; nv50_fifo_priv *priv;
int ret; int ret;
@ -207,9 +207,9 @@ nv50_fifo_init(drm_device_t *dev)
} }
void void
nv50_fifo_takedown(drm_device_t *dev) nv50_fifo_takedown(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
nv50_fifo_priv *priv = dev_priv->Engine.fifo.priv; nv50_fifo_priv *priv = dev_priv->Engine.fifo.priv;
DRM_DEBUG("\n"); DRM_DEBUG("\n");
@ -225,11 +225,11 @@ nv50_fifo_takedown(drm_device_t *dev)
} }
int int
nv50_fifo_create_context(drm_device_t *dev, int channel) nv50_fifo_create_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
nouveau_gpuobj_t *ramfc = NULL; struct nouveau_gpuobj *ramfc = NULL;
int ret; int ret;
DRM_DEBUG("ch%d\n", channel); DRM_DEBUG("ch%d\n", channel);
@ -283,9 +283,9 @@ nv50_fifo_create_context(drm_device_t *dev, int channel)
} }
void void
nv50_fifo_destroy_context(drm_device_t *dev, int channel) nv50_fifo_destroy_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
DRM_DEBUG("ch%d\n", channel); DRM_DEBUG("ch%d\n", channel);
@ -295,11 +295,11 @@ nv50_fifo_destroy_context(drm_device_t *dev, int channel)
} }
int int
nv50_fifo_load_context(drm_device_t *dev, int channel) nv50_fifo_load_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
nouveau_gpuobj_t *ramfc = chan->ramfc->gpuobj; struct nouveau_gpuobj *ramfc = chan->ramfc->gpuobj;
DRM_DEBUG("ch%d\n", channel); DRM_DEBUG("ch%d\n", channel);
@ -324,7 +324,7 @@ nv50_fifo_load_context(drm_device_t *dev, int channel)
} }
int int
nv50_fifo_save_context(drm_device_t *dev, int channel) nv50_fifo_save_context(struct drm_device *dev, int channel)
{ {
DRM_DEBUG("ch%d\n", channel); DRM_DEBUG("ch%d\n", channel);
DRM_ERROR("stub!\n"); DRM_ERROR("stub!\n");

42
shared-core/nv50_graph.c
View File

@ -31,9 +31,9 @@
#define IS_G80 ((dev_priv->chipset & 0xf0) == 0x50) #define IS_G80 ((dev_priv->chipset & 0xf0) == 0x50)
static void static void
nv50_graph_init_reset(drm_device_t *dev) nv50_graph_init_reset(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
uint32_t pmc_e; uint32_t pmc_e;
DRM_DEBUG("\n"); DRM_DEBUG("\n");
@ -45,9 +45,9 @@ nv50_graph_init_reset(drm_device_t *dev)
} }
static void static void
nv50_graph_init_regs__nv(drm_device_t *dev) nv50_graph_init_regs__nv(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
DRM_DEBUG("\n"); DRM_DEBUG("\n");
@ -66,9 +66,9 @@ nv50_graph_init_regs__nv(drm_device_t *dev)
} }
static void static void
nv50_graph_init_regs(drm_device_t *dev) nv50_graph_init_regs(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
DRM_DEBUG("\n"); DRM_DEBUG("\n");
@ -139,9 +139,9 @@ static uint32_t nv84_ctx_voodoo[] = {
}; };
static void static void
nv50_graph_init_ctxctl(drm_device_t *dev) nv50_graph_init_ctxctl(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
uint32_t *voodoo; uint32_t *voodoo;
DRM_DEBUG("\n"); DRM_DEBUG("\n");
@ -169,7 +169,7 @@ nv50_graph_init_ctxctl(drm_device_t *dev)
} }
int int
nv50_graph_init(drm_device_t *dev) nv50_graph_init(struct drm_device *dev)
{ {
DRM_DEBUG("\n"); DRM_DEBUG("\n");
@ -182,17 +182,17 @@ nv50_graph_init(drm_device_t *dev)
} }
void void
nv50_graph_takedown(drm_device_t *dev) nv50_graph_takedown(struct drm_device *dev)
{ {
DRM_DEBUG("\n"); DRM_DEBUG("\n");
} }
int int
nv50_graph_create_context(drm_device_t *dev, int channel) nv50_graph_create_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
nouveau_gpuobj_t *ramin = chan->ramin->gpuobj; struct nouveau_gpuobj *ramin = chan->ramin->gpuobj;
int grctx_size = 0x60000, hdr; int grctx_size = 0x60000, hdr;
int ret; int ret;
@ -218,9 +218,9 @@ nv50_graph_create_context(drm_device_t *dev, int channel)
} }
void void
nv50_graph_destroy_context(drm_device_t *dev, int channel) nv50_graph_destroy_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
int i, hdr; int i, hdr;
@ -234,9 +234,9 @@ nv50_graph_destroy_context(drm_device_t *dev, int channel)
} }
static int static int
nv50_graph_transfer_context(drm_device_t *dev, uint32_t inst, int save) nv50_graph_transfer_context(struct drm_device *dev, uint32_t inst, int save)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
uint32_t old_cp, tv = 20000; uint32_t old_cp, tv = 20000;
int i; int i;
@ -266,9 +266,9 @@ nv50_graph_transfer_context(drm_device_t *dev, uint32_t inst, int save)
} }
int int
nv50_graph_load_context(drm_device_t *dev, int channel) nv50_graph_load_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
uint32_t inst = ((chan->ramin->instance >> 12) | (1<<31)); uint32_t inst = ((chan->ramin->instance >> 12) | (1<<31));
int ret; int ret;
@ -288,9 +288,9 @@ nv50_graph_load_context(drm_device_t *dev, int channel)
} }
int int
nv50_graph_save_context(drm_device_t *dev, int channel) nv50_graph_save_context(struct drm_device *dev, int channel)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fifo *chan = dev_priv->fifos[channel]; struct nouveau_fifo *chan = dev_priv->fifos[channel];
uint32_t inst = ((chan->ramin->instance >> 12) | (1<<31)); uint32_t inst = ((chan->ramin->instance >> 12) | (1<<31));

22
shared-core/nv50_instmem.c
View File

@ -39,9 +39,9 @@ typedef struct {
#define NV50_INSTMEM_PT_SIZE(a) (((a) >> 12) << 3) #define NV50_INSTMEM_PT_SIZE(a) (((a) >> 12) << 3)
int int
nv50_instmem_init(drm_device_t *dev) nv50_instmem_init(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
nv50_instmem_priv *priv; nv50_instmem_priv *priv;
uint32_t rv, pt, pts, cb, cb0, cb1, unk, as; uint32_t rv, pt, pts, cb, cb0, cb1, unk, as;
uint32_t i, v; uint32_t i, v;
@ -150,9 +150,9 @@ nv50_instmem_init(drm_device_t *dev)
} }
void void
nv50_instmem_takedown(drm_device_t *dev) nv50_instmem_takedown(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
nv50_instmem_priv *priv = dev_priv->Engine.instmem.priv; nv50_instmem_priv *priv = dev_priv->Engine.instmem.priv;
int i; int i;
@ -168,7 +168,7 @@ nv50_instmem_takedown(drm_device_t *dev)
} }
int int
nv50_instmem_populate(drm_device_t *dev, nouveau_gpuobj_t *gpuobj, uint32_t *sz) nv50_instmem_populate(struct drm_device *dev, struct nouveau_gpuobj *gpuobj, uint32_t *sz)
{ {
if (gpuobj->im_backing) if (gpuobj->im_backing)
return DRM_ERR(EINVAL); return DRM_ERR(EINVAL);
@ -189,9 +189,9 @@ nv50_instmem_populate(drm_device_t *dev, nouveau_gpuobj_t *gpuobj, uint32_t *sz)
} }
void void
nv50_instmem_clear(drm_device_t *dev, nouveau_gpuobj_t *gpuobj) nv50_instmem_clear(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
if (gpuobj && gpuobj->im_backing) { if (gpuobj && gpuobj->im_backing) {
if (gpuobj->im_bound) if (gpuobj->im_bound)
@ -202,9 +202,9 @@ nv50_instmem_clear(drm_device_t *dev, nouveau_gpuobj_t *gpuobj)
} }
int int
nv50_instmem_bind(drm_device_t *dev, nouveau_gpuobj_t *gpuobj) nv50_instmem_bind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
uint32_t pte, pte_end, vram; uint32_t pte, pte_end, vram;
if (!gpuobj->im_backing || !gpuobj->im_pramin || gpuobj->im_bound) if (!gpuobj->im_backing || !gpuobj->im_pramin || gpuobj->im_bound)
@ -240,9 +240,9 @@ nv50_instmem_bind(drm_device_t *dev, nouveau_gpuobj_t *gpuobj)
} }
int int
nv50_instmem_unbind(drm_device_t *dev, nouveau_gpuobj_t *gpuobj) nv50_instmem_unbind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
uint32_t pte, pte_end; uint32_t pte, pte_end;
if (gpuobj->im_bound == 0) if (gpuobj->im_bound == 0)

6
shared-core/nv50_mc.c
View File

@ -29,14 +29,14 @@
#include "nouveau_drv.h" #include "nouveau_drv.h"
int int
nv50_mc_init(drm_device_t *dev) nv50_mc_init(struct drm_device *dev)
{ {
drm_nouveau_private_t *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
NV_WRITE(NV03_PMC_ENABLE, 0xFFFFFFFF); NV_WRITE(NV03_PMC_ENABLE, 0xFFFFFFFF);
return 0; return 0;
} }
void nv50_mc_takedown(drm_device_t *dev) void nv50_mc_takedown(struct drm_device *dev)
{ {
} }