This is a HUGE commit, but it's not nearly as bad as it looks - any problems can be isolated to a particular chipset and engine combination. It was simply too difficult to port each one at a time, the compat layers are *already* ridiculous. Most of the changes here are simply to the glue, the process for each of the engine modules was to start with a standard skeleton and copy+paste the old code into the appropriate places, fixing up variable names etc as needed. v2: Marcin Slusarz <marcin.slusarz@gmail.com> - fix find/replace bug in license header v3: Ben Skeggs <bskeggs@redhat.com> - bump indirect pushbuf size to 8KiB, 4KiB barely enough for userspace and left no space for kernel's requirements during GEM pushbuf submission. - fix duplicate assignments noticed by clang v4: Marcin Slusarz <marcin.slusarz@gmail.com> - add sparse annotations to nv04_fifo_pause/nv04_fifo_start - use ioread32_native/iowrite32_native for fifo control registers v5: Ben Skeggs <bskeggs@redhat.com> - rebase on v3.6-rc4, modified to keep copy engine fix intact - nv10/fence: unmap fence bo before destroying - fixed fermi regression when using nvidia gr fuc - fixed typo in supported dma_mask checking Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
48 lines
835 B
C
48 lines
835 B
C
#ifndef __NOUVEAU_CHAN_H__
|
|
#define __NOUVEAU_CHAN_H__
|
|
|
|
struct nouveau_cli;
|
|
|
|
struct nouveau_channel {
|
|
struct nouveau_cli *cli;
|
|
struct nouveau_drm *drm;
|
|
|
|
u32 handle;
|
|
u32 vram;
|
|
u32 gart;
|
|
|
|
struct {
|
|
struct nouveau_bo *buffer;
|
|
struct nouveau_vma vma;
|
|
u32 handle;
|
|
} push;
|
|
|
|
/* TODO: this will be reworked in the near future */
|
|
bool accel_done;
|
|
void *fence;
|
|
struct {
|
|
int max;
|
|
int free;
|
|
int cur;
|
|
int put;
|
|
int ib_base;
|
|
int ib_max;
|
|
int ib_free;
|
|
int ib_put;
|
|
} dma;
|
|
u32 user_get_hi;
|
|
u32 user_get;
|
|
u32 user_put;
|
|
|
|
struct nouveau_object *object;
|
|
};
|
|
|
|
|
|
int nouveau_channel_new(struct nouveau_drm *, struct nouveau_cli *,
|
|
u32 parent, u32 handle, u32 vram, u32 gart,
|
|
struct nouveau_channel **);
|
|
void nouveau_channel_del(struct nouveau_channel **);
|
|
int nouveau_channel_idle(struct nouveau_channel *);
|
|
|
|
#endif
|