diff options
| author | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-12-19 21:40:24 +0100 |
|---|---|---|
| committer | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-12-19 21:40:24 +0100 |
| commit | e9de2a31a5a3c5764eef7b57a896bade102bad30 (patch) | |
| tree | f1c82d3288b44eb7e909687e67354c87d01f5313 /src/gallium/drivers/nvc0/nvc0_winsys.h | |
| parent | f0f1cce9622d0bd21882071654733a6e5d41e7b0 (diff) | |
nvc0: use BIND_RING to set subchannel classes
Diffstat (limited to 'src/gallium/drivers/nvc0/nvc0_winsys.h')
| -rw-r--r-- | src/gallium/drivers/nvc0/nvc0_winsys.h | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/src/gallium/drivers/nvc0/nvc0_winsys.h b/src/gallium/drivers/nvc0/nvc0_winsys.h index 4da30ecb86..34bc536765 100644 --- a/src/gallium/drivers/nvc0/nvc0_winsys.h +++ b/src/gallium/drivers/nvc0/nvc0_winsys.h @@ -8,6 +8,7 @@ #include "nouveau/nouveau_bo.h" #include "nouveau/nouveau_channel.h" +#include "nouveau/nouveau_grobj.h" #include "nouveau/nouveau_device.h" #include "nouveau/nouveau_resource.h" #include "nouveau/nouveau_reloc.h" @@ -18,10 +19,6 @@ #define NV04_PFIFO_MAX_PACKET_LEN 2047 #endif -#define SLEEP(us) usleep(us) - -extern uint64_t nouveau_bo_gpu_address(struct nouveau_bo *); - #define NVC0_SUBCH_3D 1 #define NVC0_SUBCH_2D 2 #define NVC0_SUBCH_MF 3 @@ -36,7 +33,7 @@ extern uint64_t nouveau_bo_gpu_address(struct nouveau_bo *); #define RING_2D_(m) ((NVC0_SUBCH_2D << 13) | ((m) >> 2)) #define RING_MF_(m) ((NVC0_SUBCH_MF << 13) | ((m) >> 2)) -#define RING_ANY(m) ((NVC0_SUBCH_3D << 13) | ((m) >> 2)) +#define RING_GR(gr, m) (((gr)->subc << 13) | ((m) >> 2)) int nouveau_pushbuf_flush(struct nouveau_channel *, unsigned min); @@ -171,4 +168,22 @@ FIRE_RING(struct nouveau_channel *chan) nouveau_pushbuf_flush(chan, 0); } +static INLINE void +BIND_RING(struct nouveau_channel *chan, struct nouveau_grobj *gr, unsigned s) +{ + struct nouveau_subchannel *subc = &gr->channel->subc[s]; + + assert(s < 8); + if (subc->gr) { + assert(subc->gr->bound != NOUVEAU_GROBJ_BOUND_EXPLICIT); + subc->gr->bound = NOUVEAU_GROBJ_UNBOUND; + } + subc->gr = gr; + subc->gr->subc = s; + subc->gr->bound = NOUVEAU_GROBJ_BOUND_EXPLICIT; + + BEGIN_RING(chan, RING_GR(gr, 0x0000), 1); + OUT_RING (chan, gr->grclass); +} + #endif |