summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Chantry <chantry.xavier@gmail.com>2010-07-05 21:58:41 +0200
committerPatrice Mandin <patmandin@gmail.com>2010-07-05 21:58:41 +0200
commitbaed71aaca1a09faf2b7e5619a3b6cd59f810399 (patch)
treef22231b378c88886b30d7bfa2a7d897124272dab
parent478c9ae45fb00de92564dc3186e62e2d7577dfbe (diff)
Silence some compiler warningHEADmaster
Signed-off-by: Patrice Mandin <patmandin@gmail.com>
-rw-r--r--screen.c4
-rw-r--r--tcl_init.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/screen.c b/screen.c
index 524c7fd..5a36f9c 100644
--- a/screen.c
+++ b/screen.c
@@ -2,6 +2,8 @@
#include <stdio.h>
#include <stdint.h>
+#include <inttypes.h>
+
#include <nouveau_drm.h>
#include <nouveau_drmif.h>
#include <nouveau_bo.h>
@@ -44,7 +46,7 @@ int screen_open(int width, int height, int bpp)
}
printf("screen: chipset: 0x%08x\n", dev->chipset);
- printf("screen: vm_vram_base: 0x%lx\n", dev->vm_vram_base);
+ printf("screen: vm_vram_base: 0x%" PRIu64 "\n", dev->vm_vram_base);
printf("screen: vm_vram_size: %d MB\n", (int) (dev->vm_vram_size >> 20));
printf("screen: vm_gart_size: %d MB\n", (int) (dev->vm_gart_size >> 20));
diff --git a/tcl_init.c b/tcl_init.c
index 7729ee5..3b577ca 100644
--- a/tcl_init.c
+++ b/tcl_init.c
@@ -62,16 +62,17 @@ static void tcl_fp_color(void)
nouveau_bo_ref(NULL, &bo);
}
+#if 0
static void tcl_fp_nop(void)
{
-#if 0
+/*
000428e4 size 1, subchannel 1 (0xbeef3097),offset 0x08e4,increment
# NV30_TCL_PRIMITIVE_3D_ACTIVE_PROGRAM = 0x07bfef41
# -- program at 0x0xad7e3010 - 0x20D010
# 0x00000001 0x00000000 0x00000000 0x00000000
# INST 0: NOP (FL0.xxxx) + END
07bfef41 NV30TCL.FP_ACTIVE_PROGRAM = DMA0=TRUE | DMA1=FALSE | OFFSET=0x07bfef40
-#endif
+*/
uint32_t *map;
struct nouveau_bo *bo;
@@ -106,6 +107,7 @@ static void tcl_fp_nop(void)
nouveau_bo_ref(NULL, &bo);
}
+#endif
void tcl_init(void)
{