Module Name: src
Committed By: christos
Date: Thu Oct 17 21:15:18 UTC 2013
Modified Files:
src/sys/external/bsd/drm/dist/bsd-core: drm_memory.c drm_vm.c
via_dmablit.c
src/sys/external/bsd/drm/dist/shared-core: mga_state.c radeon_cs.c
radeon_state.c via_dma.c
Log Message:
remove unused variables
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm/dist/bsd-core/drm_vm.c
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm/dist/bsd-core/via_dmablit.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm/dist/shared-core/mga_state.c
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/drm/dist/shared-core/radeon_cs.c
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/drm/dist/shared-core/radeon_state.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm/dist/shared-core/via_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c:1.12 src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c:1.13
--- src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c:1.12 Thu Jun 6 03:55:46 2013
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c Thu Oct 17 17:15:18 2013
@@ -96,9 +96,8 @@ static void *
drm_netbsd_ioremap(struct drm_device *dev, drm_local_map_t *map, int wc)
{
bus_space_handle_t h;
- int i, reg, reason;
+ int i, reason;
for(i = 0; i<DRM_MAX_PCI_RESOURCE; i++) {
- reg = PCI_MAPREG_START + i*4;
/* Does the requested mapping lie within this resource? */
if ((dev->pci_map_data[i].maptype == PCI_MAPREG_TYPE_MEM ||
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_vm.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_vm.c:1.6 src/sys/external/bsd/drm/dist/bsd-core/drm_vm.c:1.7
--- src/sys/external/bsd/drm/dist/bsd-core/drm_vm.c:1.6 Tue Feb 15 09:24:23 2011
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_vm.c Thu Oct 17 17:15:18 2013
@@ -44,7 +44,6 @@ paddr_t drm_mmap(dev_t kdev, off_t offse
int error;
#elif defined(__NetBSD__)
paddr_t phys;
- unsigned long map_offs;
int flags = 0;
#endif
@@ -126,9 +125,6 @@ paddr_t drm_mmap(dev_t kdev, off_t offse
return -1;
}
type = map->type;
-#if defined(__NetBSD__)
- map_offs = map->offset;
-#endif
DRM_UNLOCK();
switch (type) {
Index: src/sys/external/bsd/drm/dist/bsd-core/via_dmablit.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/via_dmablit.c:1.1 src/sys/external/bsd/drm/dist/bsd-core/via_dmablit.c:1.2
--- src/sys/external/bsd/drm/dist/bsd-core/via_dmablit.c:1.1 Fri Feb 18 09:26:09 2011
+++ src/sys/external/bsd/drm/dist/bsd-core/via_dmablit.c Thu Oct 17 17:15:18 2013
@@ -29,7 +29,7 @@
/* $FreeBSD: src/sys/dev/drm/via_dmablit.c,v 1.6 2010/12/25 21:26:56 alc Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: via_dmablit.c,v 1.1 2011/02/18 14:26:09 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: via_dmablit.c,v 1.2 2013/10/17 21:15:18 christos Exp $");
/*
* Unmaps the DMA mappings.
@@ -67,7 +67,6 @@ via_unmap_blit_from_device(drm_via_sg_in
unsigned descriptor_this_page = num_desc % vsg->descriptors_per_page;
drm_via_descriptor_t *desc_ptr = vsg->desc_pages[cur_descriptor_page] +
descriptor_this_page;
- dma_addr_t next = vsg->chain_start;
while(num_desc--) {
if (descriptor_this_page-- == 0) {
@@ -76,7 +75,6 @@ via_unmap_blit_from_device(drm_via_sg_in
desc_ptr = vsg->desc_pages[cur_descriptor_page] +
descriptor_this_page;
}
- next = (dma_addr_t) desc_ptr->next;
desc_ptr--;
}
}
Index: src/sys/external/bsd/drm/dist/shared-core/mga_state.c
diff -u src/sys/external/bsd/drm/dist/shared-core/mga_state.c:1.1.1.1 src/sys/external/bsd/drm/dist/shared-core/mga_state.c:1.2
--- src/sys/external/bsd/drm/dist/shared-core/mga_state.c:1.1.1.1 Sat Jul 19 01:30:42 2008
+++ src/sys/external/bsd/drm/dist/shared-core/mga_state.c Thu Oct 17 17:15:18 2013
@@ -979,7 +979,6 @@ static int mga_dma_iload(struct drm_devi
struct drm_device_dma *dma = dev->dma;
drm_mga_private_t *dev_priv = dev->dev_private;
struct drm_buf *buf;
- drm_mga_buf_priv_t *buf_priv;
drm_mga_iload_t *iload = data;
DRM_DEBUG("\n");
@@ -996,7 +995,6 @@ static int mga_dma_iload(struct drm_devi
return -EINVAL;
buf = dma->buflist[iload->idx];
- buf_priv = buf->dev_private;
if (mga_verify_iload(dev_priv, iload->dstorg, iload->length)) {
mga_freelist_put(dev, buf);
Index: src/sys/external/bsd/drm/dist/shared-core/radeon_cs.c
diff -u src/sys/external/bsd/drm/dist/shared-core/radeon_cs.c:1.1 src/sys/external/bsd/drm/dist/shared-core/radeon_cs.c:1.2
--- src/sys/external/bsd/drm/dist/shared-core/radeon_cs.c:1.1 Sun May 23 21:39:06 2010
+++ src/sys/external/bsd/drm/dist/shared-core/radeon_cs.c Thu Oct 17 17:15:18 2013
@@ -725,7 +725,6 @@ static inline int r600_cs_packet3(struct
static int r600_cs_parse(struct drm_radeon_cs_parser *parser)
{
- volatile int rb;
struct drm_radeon_kernel_chunk *ib_chunk;
/* scan the packet for various things */
int count_dw = 0, size_dw;
@@ -765,7 +764,7 @@ static int r600_cs_parse(struct drm_rade
memcpy(parser->ib, ib_chunk->kdata, ib_chunk->length_dw * sizeof(uint32_t));
/* read back last byte to flush WC buffers */
- rb = readl(((vm_offset_t)parser->ib + (ib_chunk->length_dw-1) * sizeof(uint32_t)));
+ readl(((vm_offset_t)parser->ib + (ib_chunk->length_dw-1) * sizeof(uint32_t)));
return 0;
}
Index: src/sys/external/bsd/drm/dist/shared-core/radeon_state.c
diff -u src/sys/external/bsd/drm/dist/shared-core/radeon_state.c:1.7 src/sys/external/bsd/drm/dist/shared-core/radeon_state.c:1.8
--- src/sys/external/bsd/drm/dist/shared-core/radeon_state.c:1.7 Mon May 30 09:52:26 2011
+++ src/sys/external/bsd/drm/dist/shared-core/radeon_state.c Thu Oct 17 17:15:18 2013
@@ -2315,7 +2315,6 @@ static int radeon_cp_indices(struct drm_
struct drm_buf *buf;
drm_radeon_indices_t *elts = data;
drm_radeon_tcl_prim_t prim;
- int count;
LOCK_TEST_WITH_RETURN(dev, file_priv);
@@ -2354,7 +2353,6 @@ static int radeon_cp_indices(struct drm_
return -EINVAL;
}
- count = (elts->end - elts->start) / sizeof(u16);
elts->start -= RADEON_INDEX_PRIM_OFFSET;
if (elts->start & 0x7) {
Index: src/sys/external/bsd/drm/dist/shared-core/via_dma.c
diff -u src/sys/external/bsd/drm/dist/shared-core/via_dma.c:1.3 src/sys/external/bsd/drm/dist/shared-core/via_dma.c:1.4
--- src/sys/external/bsd/drm/dist/shared-core/via_dma.c:1.3 Fri Feb 18 09:26:10 2011
+++ src/sys/external/bsd/drm/dist/shared-core/via_dma.c Thu Oct 17 17:15:18 2013
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: via_dma.c,v 1.3 2011/02/18 14:26:10 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: via_dma.c,v 1.4 2013/10/17 21:15:18 christos Exp $");
#include "drmP.h"
#include "drm.h"
@@ -610,13 +610,11 @@ static inline void via_dummy_bitblt(drm_
static void via_cmdbuf_jump(drm_via_private_t * dev_priv)
{
- uint32_t agp_base;
uint32_t pause_addr_lo, pause_addr_hi;
uint32_t jump_addr_lo, jump_addr_hi;
volatile uint32_t *last_pause_ptr;
uint32_t dma_low_save1, dma_low_save2;
- agp_base = dev_priv->dma_offset + (uint32_t) dev_priv->agpAddr;
via_align_cmd(dev_priv, HC_HAGPBpID_JUMP, 0, &jump_addr_hi,
&jump_addr_lo, 0);
