fixup fifo size so it is page aligned

diff --git a/shared-core/nouveau_fifo.c b/shared-core/nouveau_fifo.c
index 5c32866..cf38964 100644 (file)
--- a/shared-core/nouveau_fifo.c
+++ b/shared-core/nouveau_fifo.c
@@ -138,7 +138,7 @@ static int nouveau_dma_init(struct drm_device *dev)
        drm_nouveau_private_t *dev_priv = dev->dev_private;
        struct nouveau_config *config = &dev_priv->config;
        struct mem_block *cb;
-       int cb_min_size = nouveau_fifo_number(dev) * NV03_FIFO_SIZE;
+       int cb_min_size = nouveau_fifo_number(dev) * max(NV03_FIFO_SIZE,PAGE_SIZE);
 
        /* XXX this should be done earlier on init */
        nouveau_hash_table_init(dev);

diff --git a/shared-core/nouveau_reg.h b/shared-core/nouveau_reg.h
index f15b621..868a067 100644 (file)
--- a/shared-core/nouveau_reg.h
+++ b/shared-core/nouveau_reg.h
@@ -38,7 +38,7 @@
 #define NV_DMA_TARGET_VIDMEM 0
 #define NV_DMA_TARGET_AGP    3
 
-#define NV03_FIFO_SIZE                                     0x8000
+#define NV03_FIFO_SIZE                                     0x8000UL
 #define NV_MAX_FIFO_NUMBER                                 32
 #define NV03_FIFO_REGS_SIZE                                0x10000
 #define NV03_FIFO_REGS(i)                                  (0x00800000+i*NV03_FIFO_REGS_SIZE)