diff options
| author | Luca Barbieri <luca@luca-barbieri.com> | 2010-01-29 09:53:24 +0100 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-02-16 10:16:37 +1000 |
| commit | b496c63143e9a4ca02011582329bce2df99d9b7c (patch) | |
| tree | 4721c7af5a12c86646c272524a48ea2d39eebf9d /nouveau/nouveau_bo.h | |
| parent | 4a17be4a86cde1065908576e44f3710f6d9d68af (diff) | |
nouveau: interface changes for 0.0.16 DRM
This commit encompasses the changes necessary to run on top of the 0.0.16
nouveau interface, additional APIs to support the new features of the
interface, as well as code from Luca Barbieri to improve the pushbuf
interface, which just happens to break nouveau's libdrm ABI so was delayed
until now.
API changes as a result of 0.0.16 DRM interface:
1. No more bo_pin()/bo_unpin(), these were only there for UMS and we no
longer support it.
2. Any random nouveau_bo can be submitted to the GPU as a push buffer.
3. Relocations can be applied on any nouveau_bo
This patch changes the pushbuffer ABI to:
1. No longer use/expose nouveau_pushbuffer. Everything is directly
in nouveau_channel. This saves the extra "pushbuf" pointer dereference.
2. Use cur/end pointers instead of tracking the remaining size.
Pushing data now only needs to alter cur and not both cur and remaining.
The goal is to make the *_RING macros faster and make the interface simpler
and cleaner in the process.
The *_RING APIs are unchanged, but those are inlined and the ABI is changed.
Also, anything accessing pushbuf->remaining instead of using AVAIL_RING
will need to be fixed.
Diffstat (limited to 'nouveau/nouveau_bo.h')
| -rw-r--r-- | nouveau/nouveau_bo.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/nouveau/nouveau_bo.h b/nouveau/nouveau_bo.h index fdad63ef..1e77ab0f 100644 --- a/nouveau/nouveau_bo.h +++ b/nouveau/nouveau_bo.h @@ -30,13 +30,9 @@ #define NOUVEAU_BO_WR (1 << 3) #define NOUVEAU_BO_RDWR (NOUVEAU_BO_RD | NOUVEAU_BO_WR) #define NOUVEAU_BO_MAP (1 << 4) -#define NOUVEAU_BO_PIN (1 << 5) #define NOUVEAU_BO_LOW (1 << 6) #define NOUVEAU_BO_HIGH (1 << 7) #define NOUVEAU_BO_OR (1 << 8) -#define NOUVEAU_BO_LOCAL (1 << 9) -#define NOUVEAU_BO_TILED (1 << 10) -#define NOUVEAU_BO_ZTILE (1 << 11) #define NOUVEAU_BO_INVAL (1 << 12) #define NOUVEAU_BO_NOSYNC (1 << 13) #define NOUVEAU_BO_NOWAIT (1 << 14) @@ -52,10 +48,6 @@ struct nouveau_bo { uint32_t tile_mode; uint32_t tile_flags; - - /* Available when buffer is pinned *only* */ - uint32_t flags; - uint64_t offset; }; int @@ -98,12 +90,6 @@ void nouveau_bo_unmap(struct nouveau_bo *); int -nouveau_bo_pin(struct nouveau_bo *, uint32_t flags); - -void -nouveau_bo_unpin(struct nouveau_bo *); - -int nouveau_bo_busy(struct nouveau_bo *, uint32_t access); uint32_t |