diff options
| author | Jesse Barnes <jesse.barnes@intel.com> | 2007-11-01 15:27:55 -0700 |
|---|---|---|
| committer | Jesse Barnes <jesse.barnes@intel.com> | 2007-11-01 15:27:55 -0700 |
| commit | 629c8b0dbf975632473d848f60606baf309f2f3b (patch) | |
| tree | 9b85064c2673527cb7515af7e356bb47aaa4639f /shared-core/nouveau_drv.h | |
| parent | 90d8f792794d46d1a8e998856bc7bbe54596114b (diff) | |
| parent | 5766d81074d6faa7f14b45635765cdb7209597fc (diff) | |
Merge branch 'master' into modesetting-101
Conflicts:
linux-core/Makefile.kernel
linux-core/drm_stub.c
linux-core/i915_drv.c
shared-core/i915_dma.c
shared-core/i915_drv.h
Fixup suspend/resume conflicts (basically use what's in DRM master for now).
Also fix up a few other conflicts that snuck in (i915_dma changes etc.).
Diffstat (limited to 'shared-core/nouveau_drv.h')
| -rw-r--r-- | shared-core/nouveau_drv.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/shared-core/nouveau_drv.h b/shared-core/nouveau_drv.h index e5cef075..41258a50 100644 --- a/shared-core/nouveau_drv.h +++ b/shared-core/nouveau_drv.h @@ -39,9 +39,16 @@ #define NOUVEAU_FAMILY 0x0000FFFF #define NOUVEAU_FLAGS 0xFFFF0000 +#if 0 +#if defined(__linux__) +#define NOUVEAU_HAVE_BUFFER +#endif +#endif + #include "nouveau_drm.h" #include "nouveau_reg.h" + struct mem_block { struct mem_block *next; struct mem_block *prev; @@ -553,6 +560,17 @@ extern void nv04_timer_takedown(struct drm_device *); extern long nouveau_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg); +#ifdef NOUVEAU_HAVE_BUFFER +/* nouveau_buffer.c */ +extern struct drm_ttm_backend *nouveau_create_ttm_backend_entry(struct drm_device *dev); +extern int nouveau_fence_types(struct drm_buffer_object *bo, uint32_t *fclass, uint32_t *type); +extern int nouveau_invalidate_caches(struct drm_device *dev, uint64_t buffer_flags); +extern int nouveau_init_mem_type(struct drm_device *dev, uint32_t type, struct drm_mem_type_manager *man); +extern uint32_t nouveau_evict_mask(struct drm_buffer_object *bo); +extern int nouveau_move(struct drm_buffer_object *bo, int evict, int no_wait, struct drm_bo_mem_reg *new_mem); +void nouveau_flush_ttm(struct drm_ttm *ttm); +#endif + #if defined(__powerpc__) #define NV_READ(reg) in_be32((void __iomem *)(dev_priv->mmio)->handle + (reg) ) #define NV_WRITE(reg,val) out_be32((void __iomem *)(dev_priv->mmio)->handle + (reg) , (val) ) |