diff options
| author | Jakob Bornecrantz <jakob@vmware.com> | 2010-01-05 20:59:24 +0100 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@vmware.com> | 2010-01-05 20:59:24 +0100 |
| commit | 2f7f7ceccab4176217c399502b3ff95df1517627 (patch) | |
| tree | 1a9f6e6c8ebcf5b13d9877685fce91b87a971ed2 /nouveau/nouveau_pushbuf.h | |
| parent | d6059c3dd1300662e941ccd5e55649534fbb9a63 (diff) | |
| parent | 6d3b8bbddd44b42d89adb1aafb7645e7f802673a (diff) | |
Merge branch 'master' into libkms-master
Conflicts:
configure.ac
Diffstat (limited to 'nouveau/nouveau_pushbuf.h')
| -rw-r--r-- | nouveau/nouveau_pushbuf.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/nouveau/nouveau_pushbuf.h b/nouveau/nouveau_pushbuf.h index c7ac8c45..46982afa 100644 --- a/nouveau/nouveau_pushbuf.h +++ b/nouveau/nouveau_pushbuf.h @@ -111,6 +111,14 @@ BEGIN_RING(struct nouveau_channel *chan, struct nouveau_grobj *gr, chan->pushbuf->remaining -= (size + 1); } +/* non-incrementing BEGIN_RING */ +static __inline__ void +BEGIN_RING_NI(struct nouveau_channel *chan, struct nouveau_grobj *gr, + unsigned mthd, unsigned size) +{ + BEGIN_RING(chan, gr, mthd | 0x40000000, size); +} + static __inline__ void FIRE_RING(struct nouveau_channel *chan) { |