diff options
| author | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-09-18 20:52:44 +0200 | 
|---|---|---|
| committer | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-09-18 20:53:53 +0200 | 
| commit | 613c3901c3cb748d7ef0bc3162ce3fcb986e9047 (patch) | |
| tree | b5d3fea825c29b697c7885ed257c6e560f0f875b /src | |
| parent | dbd24805071332a06828bd92ed0f6e49c897c146 (diff) | |
nv50: fix typo in fifo packet length limit
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/nouveau/nouveau_winsys.h | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_shader_state.c | 4 | 
2 files changed, 6 insertions, 2 deletions
| diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h index c9003c97f5..ab480cabd0 100644 --- a/src/gallium/drivers/nouveau/nouveau_winsys.h +++ b/src/gallium/drivers/nouveau/nouveau_winsys.h @@ -12,6 +12,10 @@  #include "nouveau/nouveau_resource.h"  #include "nouveau/nouveau_pushbuf.h" +#ifndef NV04_PFIFO_MAX_PACKET_LEN +#define NV04_PFIFO_MAX_PACKET_LEN 2047 +#endif +  static INLINE uint32_t  nouveau_screen_transfer_flags(unsigned pipe)  { diff --git a/src/gallium/drivers/nv50/nv50_shader_state.c b/src/gallium/drivers/nv50/nv50_shader_state.c index 7d2989da05..1a2fe758a8 100644 --- a/src/gallium/drivers/nv50/nv50_shader_state.c +++ b/src/gallium/drivers/nv50/nv50_shader_state.c @@ -54,7 +54,7 @@ nv50_transfer_constbuf(struct nv50_context *nv50,           continue;        }        nr = MIN2(count, nr - 7); -      nr = MIN2(nr, 2074); +      nr = MIN2(nr, NV04_PFIFO_MAX_PACKET_LEN);        nv50_screen_reloc_constbuf(nv50->screen, cbi); @@ -91,7 +91,7 @@ nv50_program_validate_data(struct nv50_context *nv50, struct nv50_program *p)              continue;           }           nr = MIN2(count, nr - 7); -         nr = MIN2(nr, 2074); +         nr = MIN2(nr, NV04_PFIFO_MAX_PACKET_LEN);           nv50_screen_reloc_constbuf(nv50->screen, NV50_CB_PMISC); | 
