radeon: fix some warnings

5 files changed, 8 insertions, 14 deletions

diff --git a/linux-core/ati_pcigart.c b/linux-core/ati_pcigart.c
index 50e990f1..6b0d8947 100644
--- a/linux-core/ati_pcigart.c
+++ b/linux-core/ati_pcigart.c
@@ -39,7 +39,7 @@
 #define ATI_PCIE_WRITE 0x4
 #define ATI_PCIE_READ 0x8
 
-static __inline__ void gart_insert_page_into_table(struct drm_ati_pcigart_info *gart_info, dma_addr_t addr, u32 *pci_gart)
+static __inline__ void gart_insert_page_into_table(struct drm_ati_pcigart_info *gart_info, dma_addr_t addr, volatile u32 *pci_gart)
 {
 	u32 page_base;
 
@@ -61,7 +61,7 @@ static __inline__ void gart_insert_page_into_table(struct drm_ati_pcigart_info *
 	*pci_gart = cpu_to_le32(page_base);
 }
 
-static __inline__ dma_addr_t gart_get_page_from_table(struct drm_ati_pcigart_info *gart_info, u32 *pci_gart)
+static __inline__ dma_addr_t gart_get_page_from_table(struct drm_ati_pcigart_info *gart_info, volatile u32 *pci_gart)
 {
 	dma_addr_t retval;
 	switch(gart_info->gart_reg_if) {
@@ -93,7 +93,7 @@ int drm_ati_alloc_pcigart_table(struct drm_device *dev,
 #ifdef CONFIG_X86
 	/* IGPs only exist on x86 in any case */
 	if (gart_info->gart_reg_if == DRM_ATI_GART_IGP)
-		set_memory_uc(gart_info->table_handle->vaddr, gart_info->table_size >> PAGE_SHIFT);
+		set_memory_uc((unsigned long)gart_info->table_handle->vaddr, gart_info->table_size >> PAGE_SHIFT);
 #endif
 
 	memset(gart_info->table_handle->vaddr, 0, gart_info->table_size);
@@ -107,7 +107,7 @@ static void drm_ati_free_pcigart_table(struct drm_device *dev,
 #ifdef CONFIG_X86
 	/* IGPs only exist on x86 in any case */
 	if (gart_info->gart_reg_if == DRM_ATI_GART_IGP)
-		set_memory_wb(gart_info->table_handle->vaddr, gart_info->table_size >> PAGE_SHIFT);
+		set_memory_wb((unsigned long)gart_info->table_handle->vaddr, gart_info->table_size >> PAGE_SHIFT);
 #endif
 	drm_pci_free(dev, gart_info->table_handle);
 	gart_info->table_handle = NULL;
@@ -260,7 +260,7 @@ static int ati_pcigart_bind_ttm(struct drm_ttm_backend *backend,
 
         j = offset;
         while (j < (offset + atipci_be->num_pages)) {
-		if (gart_get_page_from_table(info, pci_gart+j))
+		if (gart_get_page_from_table(info, pci_gart + j))
 			return -EBUSY;
                 j++;
         }
diff --git a/linux-core/drm_bufs.c b/linux-core/drm_bufs.c
index c966badc..15c426cb 100644
--- a/linux-core/drm_bufs.c
+++ b/linux-core/drm_bufs.c
@@ -1544,7 +1544,6 @@ int drm_mapbufs(struct drm_device *dev, void *data,
 				goto done;
 			}
 			down_write(&current->mm->mmap_sem);
-			DRM_DEBUG("%x %d\n", token, map->size);
 			virtual = do_mmap(file_priv->filp, 0, map->size,
 					  PROT_READ | PROT_WRITE,
 					  MAP_SHARED,
diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index e5a90892..e88378a4 100644
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -350,7 +350,6 @@ static int radeon_move_vram(struct drm_buffer_object * bo,
 	struct drm_bo_mem_reg tmp_mem;
 	struct drm_bo_mem_reg *old_mem = &bo->mem;
 	int ret; 
-	bool was_local = false;
  
 	/* old - LOCAL memory node bo->mem
 	   tmp - TT type memory node
@@ -398,7 +397,6 @@ int radeon_move(struct drm_buffer_object * bo,
 		int evict, int no_wait, struct drm_bo_mem_reg *new_mem)
 {
 	struct drm_device *dev = bo->dev;
-	struct drm_bo_mem_reg *old_mem = &bo->mem;
 	drm_radeon_private_t *dev_priv = dev->dev_private;
 
     	if (!dev_priv->cp_running)
diff --git a/shared-core/r300_reg.h b/shared-core/r300_reg.h
index 9e9cb526..1e4631db 100644
--- a/shared-core/r300_reg.h
+++ b/shared-core/r300_reg.h
@@ -1353,7 +1353,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define R300_RB3D_COLORPITCH2               0x4E40 /* GUESS */
 #define R300_RB3D_COLORPITCH3               0x4E44 /* GUESS */
 
-#define R300_RB3D_AARESOLVE_CTL             0x4E88
+//#define R300_RB3D_AARESOLVE_CTL             0x4E88
 /* gap */
 
 /* Guess by Vladimir.
diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c
index ae3a69b6..f579e01a 100644
--- a/shared-core/radeon_cp.c
+++ b/shared-core/radeon_cp.c
@@ -2434,7 +2434,7 @@ int radeon_modeset_agp_init(struct drm_device *dev)
 
 	ret = drm_agp_enable(dev, mode);
 	if (ret) {
-		DRM_ERROR("Unable to enable AGP (mode = 0x%lx)\n", mode);
+		DRM_ERROR("Unable to enable AGP (mode = 0x%lx)\n", mode.mode);
 		return ret;
 	}
 
@@ -2457,7 +2457,7 @@ int radeon_modeset_cp_init(struct drm_device *dev)
 	dev_priv->writeback_works = 0;
 
 	if (dev_priv->chip_family > CHIP_R600)
-		return;
+		return 0;
 
 	dev_priv->usec_timeout = RADEON_DEFAULT_CP_TIMEOUT;
 	dev_priv->ring.size = RADEON_DEFAULT_RING_SIZE;
@@ -2713,7 +2713,6 @@ int radeon_master_create(struct drm_device *dev, struct drm_master *master)
 void radeon_master_destroy(struct drm_device *dev, struct drm_master *master)
 {
 	struct drm_radeon_master_private *master_priv = master->driver_priv;
-	struct drm_radeon_private *dev_priv = dev->dev_private;
 
 	if (!master_priv)
 		return;
@@ -2735,8 +2734,6 @@ void radeon_master_destroy(struct drm_device *dev, struct drm_master *master)
  */
 int radeon_driver_firstopen(struct drm_device *dev)
 {
-	int ret;
-	drm_local_map_t *map;
 	drm_radeon_private_t *dev_priv = dev->dev_private;
 
 	dev_priv->gart_info.table_size = RADEON_PCIGART_TABLE_SIZE;