diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2011-12-09 16:11:06 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2012-04-14 02:47:23 +1000 |
commit | 292da616fe1f936ca78a3fa8e1b1b19883e343b6 (patch) | |
tree | cbe346a327238bb77f697beb9bd06f96f7632b28 /nouveau/nvc0_pushbuf.h | |
parent | 0d6350002d74848dd3d1e4d28d514a7ac9d580c9 (diff) |
nouveau: pull in major libdrm rewrite
Redesigned primarily to allow us to better take advantage of BO's having
fixed GPU virtual addresses on GeForce 8 and up, and to reduce the overhead
of handling relocations on earlier chipsets.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Christoph Bumiller <e0425955@student.tuwien.ac.at>
Diffstat (limited to 'nouveau/nvc0_pushbuf.h')
-rw-r--r-- | nouveau/nvc0_pushbuf.h | 92 |
1 files changed, 0 insertions, 92 deletions
diff --git a/nouveau/nvc0_pushbuf.h b/nouveau/nvc0_pushbuf.h deleted file mode 100644 index 40dc7e67..00000000 --- a/nouveau/nvc0_pushbuf.h +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright 2010 Nouveau Project - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF - * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -#ifndef __NVC0_PUSHBUF_H__ -#define __NVC0_PUSHBUF_H__ - -#include "nouveau_pushbuf.h" - -#define SUBC_BIND(chan, gr) do { \ - if (gr->bound == NOUVEAU_GROBJ_UNBOUND) \ - nouveau_grobj_autobind(gr); \ - chan->subc[gr->subc].sequence = chan->subc_sequence++; \ -} while (0) - -/* incremental methods */ -static __inline__ void -BEGIN_RING(struct nouveau_channel *chan, struct nouveau_grobj *gr, - unsigned mthd, unsigned size) -{ - SUBC_BIND(chan, gr); - WAIT_RING(chan, size + 1); - OUT_RING (chan, (0x2 << 28) | (size << 16) | (gr->subc << 13) | (mthd >> 2)); -} - -/* non-incremental */ -static __inline__ void -BEGIN_RING_NI(struct nouveau_channel *chan, struct nouveau_grobj *gr, - unsigned mthd, unsigned size) -{ - SUBC_BIND(chan, gr); - WAIT_RING(chan, size + 1); - OUT_RING (chan, (0x6 << 28) | (size << 16) | (gr->subc << 13) | (mthd >> 2)); -} - -/* increment-once */ -static __inline__ void -BEGIN_RING_1I(struct nouveau_channel *chan, struct nouveau_grobj *gr, - unsigned mthd, unsigned size) -{ - SUBC_BIND(chan, gr); - WAIT_RING(chan, size + 1); - OUT_RING (chan, (0xa << 28) | (size << 16) | (gr->subc << 13) | (mthd >> 2)); -} - -/* inline-data */ -static __inline__ void -IMMED_RING(struct nouveau_channel *chan, struct nouveau_grobj *gr, - unsigned mthd, unsigned data) -{ - SUBC_BIND(chan, gr); - WAIT_RING(chan, 1); - OUT_RING (chan, (0x8 << 28) | (data << 16) | (gr->subc << 13) | (mthd >> 2)); -} - -static __inline__ void -BIND_RING(struct nouveau_channel *chan, struct nouveau_grobj *gr, unsigned sc) -{ - struct nouveau_subchannel *subc = &gr->channel->subc[sc]; - - if (subc->gr) { - if (subc->gr->bound == NOUVEAU_GROBJ_BOUND_EXPLICIT) - assert(0); - subc->gr->bound = NOUVEAU_GROBJ_UNBOUND; - } - subc->gr = gr; - subc->gr->subc = sc; - subc->gr->bound = NOUVEAU_GROBJ_BOUND_EXPLICIT; - - BEGIN_RING(chan, gr, 0x0000, 1); - OUT_RING (chan, gr->grclass); -} - -#endif |