Module Name: src
Committed By: mrg
Date: Sat Jun 20 01:07:10 UTC 2009
Modified Files:
src/sys/external/bsd/drm/dist/bsd-core: ati_pcigart.c drmP.h
drm_agpsupport.c drm_bufs.c drm_dma.c drm_drawable.c drm_drv.c
drm_fops.c drm_ioctl.c drm_irq.c drm_memory.c drm_pci.c
drm_scatter.c drm_sysctl.c drm_vm.c
src/sys/external/bsd/drm/dist/libdrm: xf86drm.c
src/sys/external/bsd/drm/dist/shared-core: drm.h i915_suspend.c
radeon_cp.c
Log Message:
some minor clean up:
- reduce diffs to mesa-drm where possible
- fix various formatting issues
- netbsd uses major 180 for drm (XXX)
no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm/dist/bsd-core/ati_pcigart.c \
src/sys/external/bsd/drm/dist/bsd-core/drm_agpsupport.c \
src/sys/external/bsd/drm/dist/bsd-core/drm_dma.c \
src/sys/external/bsd/drm/dist/bsd-core/drm_ioctl.c \
src/sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm/dist/bsd-core/drmP.h
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c \
src/sys/external/bsd/drm/dist/bsd-core/drm_drawable.c \
src/sys/external/bsd/drm/dist/bsd-core/drm_fops.c \
src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c \
src/sys/external/bsd/drm/dist/bsd-core/drm_vm.c
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm/dist/bsd-core/drm_pci.c
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm/dist/bsd-core/drm_scatter.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/external/bsd/drm/dist/libdrm/xf86drm.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/external/bsd/drm/dist/shared-core/drm.h
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm/dist/shared-core/i915_suspend.c \
src/sys/external/bsd/drm/dist/shared-core/radeon_cp.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/ati_pcigart.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/ati_pcigart.c:1.3 src/sys/external/bsd/drm/dist/bsd-core/ati_pcigart.c:1.4
--- src/sys/external/bsd/drm/dist/bsd-core/ati_pcigart.c:1.3 Fri Jun 19 03:50:03 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/ati_pcigart.c Sat Jun 20 01:07:09 2009
@@ -63,7 +63,7 @@
struct drm_dma_handle *dmah;
int flags, ret;
#if defined(__NetBSD__)
- int nsegs;
+ int nsegs;
#endif
dmah = malloc(sizeof(struct drm_dma_handle), DRM_MEM_DMA,
@@ -107,71 +107,72 @@
}
#elif defined(__NetBSD__)
- dmah->tag = dev->pa.pa_dmat;
+ dmah->tag = dev->pa.pa_dmat;
flags = BUS_DMA_NOWAIT;
if (gart_info->gart_reg_if == DRM_ATI_GART_IGP)
- flags |= BUS_DMA_NOCACHE;
+ flags |= BUS_DMA_NOCACHE;
+
+ ret = bus_dmamem_alloc(dmah->tag, gart_info->table_size, PAGE_SIZE,
+ 0, dmah->segs, 1, &nsegs, flags);
+ if (ret != 0) {
+ printf("drm: unable to allocate %zu bytes of DMA, error %d\n",
+ (size_t)gart_info->table_size, ret);
+ dmah->tag = NULL;
+ free(dmah, DRM_MEM_DMA);
+ return ENOMEM;
+ }
+ if (nsegs != 1) {
+ printf("drm: bad segment count\n");
+ bus_dmamem_free(dmah->tag, dmah->segs, 1);
+ dmah->tag = NULL;
+ free(dmah, DRM_MEM_DMA);
+ return ENOMEM;
+ }
+
+ ret = bus_dmamem_map(dmah->tag, dmah->segs, nsegs,
+ gart_info->table_size, &dmah->vaddr,
+ flags | BUS_DMA_COHERENT);
+ if (ret != 0) {
+ printf("drm: Unable to map DMA, error %d\n", ret);
+ bus_dmamem_free(dmah->tag, dmah->segs, 1);
+ dmah->tag = NULL;
+ free(dmah, DRM_MEM_DMA);
+ return ENOMEM;
+ }
- ret = bus_dmamem_alloc(dmah->tag, gart_info->table_size, PAGE_SIZE,
- 0, dmah->segs, 1, &nsegs, flags);
- if (ret != 0) {
- printf("drm: unable to allocate %zu bytes of DMA, error %d\n",
- (size_t)gart_info->table_size, ret);
- dmah->tag = NULL;
- free(dmah, DRM_MEM_DMA);
- return ENOMEM;
- }
- if (nsegs != 1) {
- printf("drm: bad segment count\n");
- bus_dmamem_free(dmah->tag, dmah->segs, 1);
- dmah->tag = NULL;
- free(dmah, DRM_MEM_DMA);
- return ENOMEM;
- }
-
- ret = bus_dmamem_map(dmah->tag, dmah->segs, nsegs, gart_info->table_size,
- &dmah->vaddr, flags | BUS_DMA_COHERENT);
- if (ret != 0) {
- printf("drm: Unable to map DMA, error %d\n", ret);
- bus_dmamem_free(dmah->tag, dmah->segs, 1);
- dmah->tag = NULL;
- free(dmah, DRM_MEM_DMA);
- return ENOMEM;
- }
-
- ret = bus_dmamap_create(dmah->tag, gart_info->table_size, 1,
- gart_info->table_size, 0,
- BUS_DMA_NOWAIT | BUS_DMA_ALLOCNOW, &dmah->map);
- if (ret != 0) {
+ ret = bus_dmamap_create(dmah->tag, gart_info->table_size, 1,
+ gart_info->table_size, 0,
+ BUS_DMA_NOWAIT | BUS_DMA_ALLOCNOW, &dmah->map);
+ if (ret != 0) {
printf("drm: Unable to create DMA map, error %d\n", ret);
- bus_dmamem_unmap(dmah->tag, dmah->vaddr, gart_info->table_size);
- bus_dmamem_free(dmah->tag, dmah->segs, 1);
- dmah->tag = NULL;
- free(dmah, DRM_MEM_DMA);
- return ENOMEM;
- }
-
- ret = bus_dmamap_load(dmah->tag, dmah->map, dmah->vaddr,
- gart_info->table_size, NULL, BUS_DMA_NOWAIT);
- if (ret != 0) {
+ bus_dmamem_unmap(dmah->tag, dmah->vaddr, gart_info->table_size);
+ bus_dmamem_free(dmah->tag, dmah->segs, 1);
+ dmah->tag = NULL;
+ free(dmah, DRM_MEM_DMA);
+ return ENOMEM;
+ }
+
+ ret = bus_dmamap_load(dmah->tag, dmah->map, dmah->vaddr,
+ gart_info->table_size, NULL, BUS_DMA_NOWAIT);
+ if (ret != 0) {
printf("drm: Unable to load DMA map, error %d\n", ret);
- bus_dmamap_destroy(dmah->tag, dmah->map);
- bus_dmamem_unmap(dmah->tag, dmah->vaddr, gart_info->table_size);
- bus_dmamem_free(dmah->tag, dmah->segs, 1);
- dmah->tag = NULL;
- free(dmah, DRM_MEM_DMA);
- return ENOMEM;
- }
- dmah->busaddr = dmah->map->dm_segs[0].ds_addr;
- dmah->size = gart_info->table_size;
- dmah->nsegs = 1;
- /*
- * Mirror here FreeBSD doing BUS_DMA_ZERO.
- * But I see this same memset() is done in drm_ati_pcigart_init(),
- * so maybe this is not needed.
- */
- memset(dmah->vaddr, 0, gart_info->table_size);
+ bus_dmamap_destroy(dmah->tag, dmah->map);
+ bus_dmamem_unmap(dmah->tag, dmah->vaddr, gart_info->table_size);
+ bus_dmamem_free(dmah->tag, dmah->segs, 1);
+ dmah->tag = NULL;
+ free(dmah, DRM_MEM_DMA);
+ return ENOMEM;
+ }
+ dmah->busaddr = dmah->map->dm_segs[0].ds_addr;
+ dmah->size = gart_info->table_size;
+ dmah->nsegs = 1;
+ /*
+ * Mirror here FreeBSD doing BUS_DMA_ZERO.
+ * But I see this same memset() is done in drm_ati_pcigart_init(),
+ * so maybe this is not needed.
+ */
+ memset(dmah->vaddr, 0, gart_info->table_size);
#endif
dev->sg->dmah = dmah;
@@ -189,11 +190,11 @@
bus_dmamem_free(dmah->tag, dmah->vaddr, dmah->map);
bus_dma_tag_destroy(dmah->tag);
#elif defined(__NetBSD__)
- bus_dmamap_unload(dmah->tag, dmah->map);
- bus_dmamap_destroy(dmah->tag, dmah->map);
- bus_dmamem_unmap(dmah->tag, dmah->vaddr, dmah->size);
- bus_dmamem_free(dmah->tag, dmah->segs, 1);
- dmah->tag = NULL;
+ bus_dmamap_unload(dmah->tag, dmah->map);
+ bus_dmamap_destroy(dmah->tag, dmah->map);
+ bus_dmamem_unmap(dmah->tag, dmah->vaddr, dmah->size);
+ bus_dmamem_free(dmah->tag, dmah->segs, 1);
+ dmah->tag = NULL;
#endif
free(dmah, DRM_MEM_DMA);
dev->sg->dmah = NULL;
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_agpsupport.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_agpsupport.c:1.3 src/sys/external/bsd/drm/dist/bsd-core/drm_agpsupport.c:1.4
--- src/sys/external/bsd/drm/dist/bsd-core/drm_agpsupport.c:1.3 Fri Jun 19 03:50:03 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_agpsupport.c Sat Jun 20 01:07:09 2009
@@ -83,7 +83,8 @@
return 0;
#endif
#elif defined(__NetBSD__)
- return pci_get_capability(dev->pa.pa_pc, dev->pa.pa_tag, cap, NULL, NULL);
+ return pci_get_capability(dev->pa.pa_pc, dev->pa.pa_tag, cap, NULL,
+ NULL);
#endif
}
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_dma.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_dma.c:1.3 src/sys/external/bsd/drm/dist/bsd-core/drm_dma.c:1.4
--- src/sys/external/bsd/drm/dist/bsd-core/drm_dma.c:1.3 Fri Jun 19 03:50:03 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_dma.c Sat Jun 20 01:07:09 2009
@@ -67,8 +67,8 @@
for (j = 0; j < dma->bufs[i].seg_count; j++) {
drm_pci_free(dev, dma->bufs[i].seglist[j]);
}
- if (dma->bufs[i].seglist)
- free(dma->bufs[i].seglist, DRM_MEM_SEGS);
+ if (dma->bufs[i].seglist)
+ free(dma->bufs[i].seglist, DRM_MEM_SEGS);
}
if (dma->bufs[i].buf_count) {
@@ -76,17 +76,17 @@
free(dma->bufs[i].buflist[j].dev_private,
DRM_MEM_BUFS);
}
- if (dma->bufs[i].buflist)
- free(dma->bufs[i].buflist, DRM_MEM_BUFS);
+ if (dma->bufs[i].buflist)
+ free(dma->bufs[i].buflist, DRM_MEM_BUFS);
}
}
- if (dma->buflist)
- free(dma->buflist, DRM_MEM_BUFS);
- if (dma->pagelist)
- free(dma->pagelist, DRM_MEM_PAGES);
- if (dev->dma)
- free(dev->dma, DRM_MEM_DRIVER);
+ if (dma->buflist)
+ free(dma->buflist, DRM_MEM_BUFS);
+ if (dma->pagelist)
+ free(dma->pagelist, DRM_MEM_PAGES);
+ if (dev->dma)
+ free(dev->dma, DRM_MEM_DRIVER);
dev->dma = NULL;
DRM_SPINUNINIT(&dev->dma_lock);
}
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_ioctl.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_ioctl.c:1.3 src/sys/external/bsd/drm/dist/bsd-core/drm_ioctl.c:1.4
--- src/sys/external/bsd/drm/dist/bsd-core/drm_ioctl.c:1.3 Fri Jun 19 03:50:03 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_ioctl.c Sat Jun 20 01:07:09 2009
@@ -62,7 +62,7 @@
struct drm_file *file_priv)
{
#if defined(__NetBSD__)
- return EOPNOTSUPP;
+ return EOPNOTSUPP;
#else
struct drm_unique *u = data;
int domain, bus, slot, func, ret;
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c:1.3 src/sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c:1.4
--- src/sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c:1.3 Fri Jun 19 03:50:03 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c Sat Jun 20 01:07:09 2009
@@ -54,7 +54,7 @@
#elif defined(__NetBSD__)
const struct sysctlnode *dri, *dri_card, *dri_debug;
const struct sysctlnode *dri_rest[DRM_SYSCTL_ENTRIES];
- char name[7];
+ char name[7];
#endif
};
@@ -193,7 +193,7 @@
struct drm_device *dev = arg1;
#elif defined(__NetBSD__)
struct drm_device *dev = rnode->sysctl_data;
- int len = 0;
+ int len = 0;
#endif
char buf[128];
int retcode;
@@ -231,7 +231,7 @@
struct drm_device *dev = arg1;
#elif defined(__NetBSD__)
struct drm_device *dev = rnode->sysctl_data;
- int len = 0;
+ int len = 0;
#endif
drm_local_map_t *map, *tempmaps;
const char *types[] = { "FB", "REG", "SHM", "AGP", "SG" };
@@ -296,7 +296,7 @@
struct drm_device *dev = arg1;
#elif defined(__NetBSD__)
struct drm_device *dev = rnode->sysctl_data;
- int len = 0;
+ int len = 0;
#endif
drm_device_dma_t *dma = dev->dma;
drm_device_dma_t tempdma;
@@ -358,7 +358,7 @@
struct drm_device *dev = arg1;
#elif defined(__NetBSD__)
struct drm_device *dev = rnode->sysctl_data;
- int len = 0;
+ int len = 0;
#endif
struct drm_file *priv, *tempprivs;
char buf[128];
Index: src/sys/external/bsd/drm/dist/bsd-core/drmP.h
diff -u src/sys/external/bsd/drm/dist/bsd-core/drmP.h:1.11 src/sys/external/bsd/drm/dist/bsd-core/drmP.h:1.12
--- src/sys/external/bsd/drm/dist/bsd-core/drmP.h:1.11 Fri Jun 19 03:50:03 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drmP.h Sat Jun 20 01:07:09 2009
@@ -290,7 +290,6 @@
#elif defined(__NetBSD__)
-#define CDEV_MAJOR 34
#define PAGE_ALIGN(addr) ALIGN(addr)
#define DRM_SUSER(p) (kauth_cred_getsvuid((p)->p_cred) == 0)
#define DRM_AGP_FIND_DEVICE() agp_find_device(0)
@@ -558,7 +557,7 @@
bus_dmamap_t map;
#if defined(__NetBSD__)
size_t size;
- size_t nsegs;
+ size_t nsegs;
bus_dma_segment_t segs[1];
#endif
} drm_dma_handle_t;
@@ -584,7 +583,7 @@
pid_t pid;
uid_t uid;
#if defined(__NetBSD__)
- int refs;
+ int refs;
#endif
drm_magic_t magic;
unsigned long ioctl_count;
@@ -671,8 +670,8 @@
bus_space_handle_t bsh;
drm_dma_handle_t *dmah;
#if defined(__NetBSD__)
- int *cnt;
- bus_size_t mapsize;
+ int *cnt;
+ bus_size_t mapsize;
#endif
TAILQ_ENTRY(drm_local_map) link;
} drm_local_map_t;
@@ -888,7 +887,7 @@
#if defined(__FreeBSD__)
struct sigio *buf_sigio; /* Processes waiting for SIGIO */
#elif defined(__NetBSD__)
- pid_t buf_pgid;
+ pid_t buf_pgid;
#endif
/* Sysctl support */
@@ -904,7 +903,7 @@
#if defined(__FreeBSD__)
struct unrhdr *drw_unrhdr;
#elif defined(__NetBSD__)
- int drw_no;
+ int drw_no;
#endif
/* RB tree of drawable infos */
RB_HEAD(drawable_tree, bsd_drm_drawable_info) drw_head;
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c:1.4 src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c:1.5
--- src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c:1.4 Fri Jun 19 03:50:03 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c Sat Jun 20 01:07:09 2009
@@ -81,7 +81,7 @@
#if defined(__FreeBSD__)
return rman_get_start(dev->pcir[resource]);
#elif defined(__NetBSD__)
- return dev->pci_map_data[resource].base;
+ return dev->pci_map_data[resource].base;
#endif
}
@@ -94,7 +94,7 @@
#if defined(__FreeBSD__)
return rman_get_size(dev->pcir[resource]);
#elif defined(__NetBSD__)
- return dev->pci_map_data[resource].size;
+ return dev->pci_map_data[resource].size;
#endif
}
@@ -588,12 +588,12 @@
if (entry->buflist == NULL || entry->seglist == NULL ||
temp_pagelist == NULL) {
- if (temp_pagelist)
- free(temp_pagelist, DRM_MEM_PAGES);
- if (entry->seglist)
- free(entry->seglist, DRM_MEM_SEGS);
- if (entry->buflist)
- free(entry->buflist, DRM_MEM_BUFS);
+ if (temp_pagelist)
+ free(temp_pagelist, DRM_MEM_PAGES);
+ if (entry->seglist)
+ free(entry->seglist, DRM_MEM_SEGS);
+ if (entry->buflist)
+ free(entry->buflist, DRM_MEM_BUFS);
return ENOMEM;
}
@@ -1049,7 +1049,7 @@
vm_size_t size;
vm_offset_t vaddr;
#elif defined(__NetBSD__)
- struct vnode *vn;
+ struct vnode *vn;
voff_t foff;
vsize_t size, rsize;
vaddr_t vaddr;
@@ -1065,7 +1065,7 @@
#if defined(__FreeBSD__)
vms = DRM_CURPROC->td_proc->p_vmspace;
#elif defined(__NetBSD__)
- vms = DRM_CURPROC->p_vmspace;
+ vms = DRM_CURPROC->p_vmspace;
#endif
DRM_SPINLOCK(&dev->dma_lock);
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_drawable.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_drawable.c:1.4 src/sys/external/bsd/drm/dist/bsd-core/drm_drawable.c:1.5
--- src/sys/external/bsd/drm/dist/bsd-core/drm_drawable.c:1.4 Fri Jun 19 03:50:03 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_drawable.c Sat Jun 20 01:07:09 2009
@@ -81,7 +81,7 @@
#endif
DRM_SPINLOCK(&dev->drw_lock);
#if defined(__NetBSD__)
- info->handle = ++dev->drw_no;
+ info->handle = ++dev->drw_no;
#endif
RB_INSERT(drawable_tree, &dev->drw_head, info);
draw->handle = info->handle;
@@ -106,8 +106,8 @@
#if defined(__FreeBSD__)
free_unr(dev->drw_unrhdr, draw->handle);
#endif
- if (info->rects)
- free(info->rects, DRM_MEM_DRAWABLE);
+ if (info->rects)
+ free(info->rects, DRM_MEM_DRAWABLE);
free(info, DRM_MEM_DRAWABLE);
return 0;
} else {
@@ -131,8 +131,8 @@
case DRM_DRAWABLE_CLIPRECTS:
DRM_SPINLOCK(&dev->drw_lock);
if (update->num != info->num_rects) {
- if (info->rects)
- free(info->rects, DRM_MEM_DRAWABLE);
+ if (info->rects)
+ free(info->rects, DRM_MEM_DRAWABLE);
info->rects = NULL;
info->num_rects = 0;
}
@@ -173,8 +173,8 @@
#if defined(__FreeBSD__)
free_unr(dev->drw_unrhdr, info->handle);
#endif
- if (info->info.rects)
- free(info->info.rects, DRM_MEM_DRAWABLE);
+ if (info->info.rects)
+ free(info->info.rects, DRM_MEM_DRAWABLE);
free(info, DRM_MEM_DRAWABLE);
DRM_SPINLOCK(&dev->drw_lock);
}
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_fops.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_fops.c:1.4 src/sys/external/bsd/drm/dist/bsd-core/drm_fops.c:1.5
--- src/sys/external/bsd/drm/dist/bsd-core/drm_fops.c:1.4 Fri Jun 19 03:50:03 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_fops.c Sat Jun 20 01:07:09 2009
@@ -51,7 +51,7 @@
return priv;
}
- return NULL;
+ return NULL;
}
/* drm_open_helper is called whenever a process opens /dev/drm. */
@@ -115,7 +115,7 @@
struct drm_device *dev)
{
struct drm_file *priv;
- int m = minor(kdev);
+ int m = minor(kdev);
int retcode;
if (flags & O_EXCL)
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.4 src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c:1.5
--- src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c:1.4 Fri Jun 19 03:50:03 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c Sat Jun 20 01:07:09 2009
@@ -103,8 +103,8 @@
map->bsh = dev->pci_map_data[i].bsh;
return dev->pci_map_data[i].vaddr;
}
- DRM_DEBUG("ioremap%s: flags %d\n",
- wc ? "_wc" : "", dev->pci_map_data[i].flags);
+ DRM_DEBUG("ioremap%s: flags %d\n", wc ? "_wc" : "",
+ dev->pci_map_data[i].flags);
if ((reason = bus_space_map(map->bst, map->offset,
dev->pci_map_data[i].size,
dev->pci_map_data[i].flags, &map->bsh)))
@@ -151,8 +151,8 @@
map->cnt = &(dev->agp_map_data[i].mapped);
map->mapsize = dev->agp_map_data[i].size;
- DRM_DEBUG("ioremap%s: flags %d\n",
- wc ? "_wc" : "", dev->agp_map_data[i].flags);
+ DRM_DEBUG("ioremap%s: flags %d\n", wc ? "_wc" : "",
+ dev->agp_map_data[i].flags);
rv = bus_space_map(map->bst, map->offset,
dev->agp_map_data[i].size,
dev->agp_map_data[i].flags, &map->bsh);
@@ -183,7 +183,7 @@
#if defined(__FreeBSD__)
return pmap_mapdev_attr(map->offset, map->size, PAT_WRITE_COMBINING);
#elif defined(__NetBSD__)
- return drm_netbsd_ioremap(dev, map, 1);
+ return drm_netbsd_ioremap(dev, map, 1);
#endif
}
@@ -192,7 +192,7 @@
#if defined(__FreeBSD__)
return pmap_mapdev(map->offset, map->size);
#elif defined(__NetBSD__)
- return drm_netbsd_ioremap(dev, map, 0);
+ return drm_netbsd_ioremap(dev, map, 0);
#endif
}
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.4 src/sys/external/bsd/drm/dist/bsd-core/drm_vm.c:1.5
--- src/sys/external/bsd/drm/dist/bsd-core/drm_vm.c:1.4 Fri Jun 19 03:50:03 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_vm.c Sat Jun 20 01:07:09 2009
@@ -43,7 +43,7 @@
vm_paddr_t phys;
int error;
#elif defined(__NetBSD__)
- paddr_t phys;
+ paddr_t phys;
unsigned long map_offs;
#endif
@@ -58,13 +58,13 @@
return EINVAL;
}
#elif defined(__NetBSD__)
- DRM_LOCK();
- file_priv = drm_find_file_by_proc(dev, DRM_CURPROC);
- DRM_UNLOCK();
- if (file_priv == NULL) {
+ DRM_LOCK();
+ file_priv = drm_find_file_by_proc(dev, DRM_CURPROC);
+ DRM_UNLOCK();
+ if (file_priv == NULL) {
DRM_ERROR("Could not find authenticator!\n");
return -1;
- }
+ }
#endif
if (file_priv && !file_priv->authenticated)
@@ -88,7 +88,7 @@
*paddr = physaddr;
return 0;
#elif defined(__NetBSD__)
- return atop(physaddr);
+ return atop(physaddr);
#endif
} else {
DRM_SPINUNLOCK(&dev->dma_lock);
@@ -162,7 +162,7 @@
*paddr = phys;
return 0;
#elif defined(__NetBSD__)
- return atop(phys);
+ return atop(phys);
#endif
}
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.12 src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.13
--- src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.12 Fri Jun 19 03:50:03 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c Sat Jun 20 01:07:09 2009
@@ -33,6 +33,7 @@
* open/close, and ioctl dispatch.
*/
+
#if defined(__FreeBSD__)
#include <sys/limits.h>
#elif defined(__NetBSD__)
@@ -311,7 +312,7 @@
drm_poll,
drm_mmap,
nokqfilter,
- D_TTY
+ D_TTY | D_NEGOFFSAFE
};
int drm_refcnt = 0;
@@ -336,15 +337,15 @@
struct drm_device *dev;
int unit;
- unit = device_unit(kdev);
- if (unit < 0 || unit >= DRM_MAXUNITS)
- panic("drm_attach: device unit %d invalid", unit);
- if (drm_units[unit] != NULL)
- panic("drm_attach: unit %d already attached", unit);
+ unit = device_unit(kdev);
+ if (unit < 0 || unit >= DRM_MAXUNITS)
+ panic("drm_attach: device unit %d invalid", unit);
+ if (drm_units[unit] != NULL)
+ panic("drm_attach: unit %d already attached", unit);
dev = device_private(kdev);
- dev->device = kdev;
- drm_units[unit] = dev;
+ dev->device = kdev;
+ drm_units[unit] = dev;
for (unit = 0; unit < DRM_MAX_PCI_RESOURCE; unit++)
{
@@ -366,8 +367,8 @@
}
if (dev->pci_map_data[unit].maptype == PCI_MAPREG_TYPE_MEM)
dev->pci_map_data[unit].flags |= BUS_SPACE_MAP_LINEAR;
- if (dev->pci_map_data[unit].maptype
- == (PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_64BIT))
+ if (dev->pci_map_data[unit].maptype ==
+ (PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_64BIT))
dev->pci_map_data[unit].flags |= BUS_SPACE_MAP_LINEAR;
DRM_DEBUG("pci resource %d: type=%d, base=%lx, size=%zx, flags=%x\n",
unit, dev->pci_map_data[unit].maptype,
@@ -414,9 +415,9 @@
drm_unload(dev);
- drm_units[device_unit(self)] = NULL;
+ drm_units[device_unit(self)] = NULL;
- free(dev->driver, DRM_MEM_DRIVER);
+ free(dev->driver, DRM_MEM_DRIVER);
return 0;
}
@@ -491,7 +492,7 @@
#if defined(__FreeBSD__)
dev->buf_sigio = NULL;
#elif defined(__NetBSD__)
- dev->buf_pgid = 0;
+ dev->buf_pgid = 0;
#endif
DRM_DEBUG("\n");
@@ -643,11 +644,11 @@
goto error;
}
#else
- dev->drw_no = 0;
+ dev->drw_no = 0;
#endif
#if defined(__NetBSD__)
- aprint_normal_dev(dev->device,
+ aprint_normal_dev(dev->device,
#else
DRM_INFO(
#endif
@@ -699,9 +700,9 @@
retcode = drm_mtrr_del(
#if defined(__FreeBSD__)
- 0,
+ 0,
#endif
- dev->agp->info.ai_aperture_base,
+ dev->agp->info.ai_aperture_base,
dev->agp->info.ai_aperture_size, DRM_MTRR_WC);
DRM_DEBUG("mtrr_del = %d", retcode);
}
@@ -789,10 +790,9 @@
dev = DRIVER_SOFTC(dev2unit(kdev));
#elif defined(__NetBSD__)
dev = DRIVER_SOFTC(kdev);
- if (dev == NULL) {
- return ENXIO;
- }
- dev->kdev = kdev;
+ if (dev == NULL)
+ return ENXIO;
+ dev->kdev = kdev;
#endif
DRM_DEBUG("open_count = %d\n", dev->open_count);
@@ -825,10 +825,10 @@
int retcode = 0;
#if defined(__FreeBSD__)
- file_priv = data;
- dev = file_priv->dev;
+ file_priv = data;
+ dev = file_priv->dev;
#elif defined(__NetBSD__)
- dev = DRIVER_SOFTC(kdev);
+ dev = DRIVER_SOFTC(kdev);
#endif
DRM_DEBUG("open_count = %d\n", dev->open_count);
@@ -836,12 +836,12 @@
DRM_LOCK();
#if defined(__NetBSD__)
- file_priv = drm_find_file_by_proc(dev, l->l_proc);
- if (file_priv == NULL) {
- DRM_UNLOCK();
- DRM_ERROR("can't find authenticator\n");
- return EINVAL;
- }
+ file_priv = drm_find_file_by_proc(dev, l->l_proc);
+ if (file_priv == NULL) {
+ DRM_UNLOCK();
+ DRM_ERROR("can't find authenticator\n");
+ return EINVAL;
+ }
#endif
if (dev->driver->preclose != NULL)
@@ -913,7 +913,7 @@
#if defined(__FreeBSD__)
funsetown(&dev->buf_sigio);
#else
- dev->buf_pgid = 0;
+ dev->buf_pgid = 0;
#endif
if (dev->driver->postclose != NULL)
@@ -941,7 +941,7 @@
DRM_UNLOCK();
#if defined(__NetBSD__)
- return retcode;
+ return retcode;
#endif
}
@@ -965,10 +965,10 @@
return EINVAL;
}
#elif defined(__NetBSD__)
- DRM_LOCK();
- file_priv = drm_find_file_by_proc(dev, p->l_proc);
- DRM_UNLOCK();
- if (file_priv == NULL) {
+ DRM_LOCK();
+ file_priv = drm_find_file_by_proc(dev, p->l_proc);
+ DRM_UNLOCK();
+ if (file_priv == NULL) {
DRM_ERROR("can't find authenticator\n");
return EINVAL;
}
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c:1.9 src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c:1.10
--- src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c:1.9 Fri Jun 19 03:50:03 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c Sat Jun 20 01:07:09 2009
@@ -82,19 +82,19 @@
int i;
#if defined(__NetBSD__)
- mutex_enter(&dev->vbl_lock);
+ mutex_enter(&dev->vbl_lock);
#endif
if (callout_pending(&dev->vblank_disable_timer)) {
/* callout was reset */
#if defined(__NetBSD__)
- mutex_exit(&dev->vbl_lock);
+ mutex_exit(&dev->vbl_lock);
#endif
return;
}
if (!callout_active(&dev->vblank_disable_timer)) {
/* callout was stopped */
#if defined(__NetBSD__)
- mutex_exit(&dev->vbl_lock);
+ mutex_exit(&dev->vbl_lock);
#endif
return;
}
@@ -103,10 +103,10 @@
DRM_DEBUG("vblank_disable_allowed=%d\n", dev->vblank_disable_allowed);
if (!dev->vblank_disable_allowed) {
#if defined(__NetBSD__)
- mutex_exit(&dev->vbl_lock);
+ mutex_exit(&dev->vbl_lock);
#endif
return;
- }
+ }
for (i = 0; i < dev->num_crtcs; i++) {
if (atomic_read(&dev->vblank[i].refcount) == 0 &&
@@ -119,7 +119,7 @@
}
}
#if defined(__NetBSD__)
- mutex_exit(&dev->vbl_lock);
+ mutex_exit(&dev->vbl_lock);
#endif
}
@@ -501,8 +501,8 @@
&dev->irq_lock, PCATCH, "vblwtq",
3 * DRM_HZ);
#elif defined(__NetBSD__)
- ret = mtsleep(&dev->vblank[crtc].queue,
- PCATCH, "vblwtq", 3 * DRM_HZ, &dev->irq_lock);
+ ret = mtsleep(&dev->vblank[crtc].queue,
+ PCATCH, "vblwtq", 3 * DRM_HZ, &dev->irq_lock);
#endif
DRM_SPINUNLOCK(&dev->irq_lock);
}
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_pci.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_pci.c:1.6 src/sys/external/bsd/drm/dist/bsd-core/drm_pci.c:1.7
--- src/sys/external/bsd/drm/dist/bsd-core/drm_pci.c:1.6 Fri Jun 19 03:50:03 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_pci.c Sat Jun 20 01:07:09 2009
@@ -59,7 +59,7 @@
drm_dma_handle_t *dmah;
int ret;
#if defined (__NetBSD__)
- int nsegs;
+ int nsegs;
#endif
/* Need power-of-two alignment, so fail the allocation if it isn't. */
@@ -116,49 +116,49 @@
dmah->segs, 1, &nsegs, BUS_DMA_WAITOK)) != 0) {
printf("drm: Unable to allocate %zu bytes of DMA, error %d\n",
size, ret);
- dmah->tag = NULL;
+ dmah->tag = NULL;
free(dmah, DRM_MEM_DMA);
- return NULL;
+ return NULL;
}
/* XXX is there a better way to deal with this? */
if (nsegs != 1) {
printf("drm: bad segment count from bus_dmamem_alloc\n");
- bus_dmamem_free(dmah->tag, dmah->segs, 1);
- dmah->tag = NULL;
+ bus_dmamem_free(dmah->tag, dmah->segs, 1);
+ dmah->tag = NULL;
free(dmah, DRM_MEM_DMA);
- return NULL;
+ return NULL;
}
if ((ret = bus_dmamem_map(dmah->tag, dmah->segs, nsegs, size,
&dmah->vaddr, BUS_DMA_NOWAIT | BUS_DMA_COHERENT | BUS_DMA_NOCACHE)) != 0) {
printf("drm: Unable to map DMA, error %d\n", ret);
- bus_dmamem_free(dmah->tag, dmah->segs, 1);
- dmah->tag = NULL;
+ bus_dmamem_free(dmah->tag, dmah->segs, 1);
+ dmah->tag = NULL;
free(dmah, DRM_MEM_DMA);
- return NULL;
+ return NULL;
}
if ((ret = bus_dmamap_create(dmah->tag, size, 1, size, maxaddr,
BUS_DMA_NOWAIT, &dmah->map)) != 0) {
printf("drm: Unable to create DMA map, error %d\n", ret);
- bus_dmamem_unmap(dmah->tag, dmah->vaddr, size);
- bus_dmamem_free(dmah->tag, dmah->segs, 1);
- dmah->tag = NULL;
+ bus_dmamem_unmap(dmah->tag, dmah->vaddr, size);
+ bus_dmamem_free(dmah->tag, dmah->segs, 1);
+ dmah->tag = NULL;
free(dmah, DRM_MEM_DMA);
- return NULL;
+ return NULL;
}
if ((ret = bus_dmamap_load(dmah->tag, dmah->map, dmah->vaddr,
size, NULL, BUS_DMA_NOWAIT | BUS_DMA_NOCACHE)) != 0) {
printf("drm: Unable to load DMA map, error %d\n", ret);
- bus_dmamap_destroy(dmah->tag, dmah->map);
- bus_dmamem_unmap(dmah->tag, dmah->vaddr, size);
- bus_dmamem_free(dmah->tag, dmah->segs, 1);
- dmah->tag = NULL;
+ bus_dmamap_destroy(dmah->tag, dmah->map);
+ bus_dmamem_unmap(dmah->tag, dmah->vaddr, size);
+ bus_dmamem_free(dmah->tag, dmah->segs, 1);
+ dmah->tag = NULL;
free(dmah, DRM_MEM_DMA);
- return NULL;
+ return NULL;
}
dmah->busaddr = dmah->map->dm_segs[0].ds_addr;
dmah->size = size;
- dmah->nsegs = 1;
- memset(dmah->vaddr, 0, size);
+ dmah->nsegs = 1;
+ memset(dmah->vaddr, 0, size);
#endif
return dmah;
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_scatter.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_scatter.c:1.2 src/sys/external/bsd/drm/dist/bsd-core/drm_scatter.c:1.3
--- src/sys/external/bsd/drm/dist/bsd-core/drm_scatter.c:1.2 Fri Jun 19 03:50:03 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_scatter.c Sat Jun 20 01:07:09 2009
@@ -49,7 +49,7 @@
unsigned long pages;
int ret;
#if defined(__NetBSD__)
- int nsegs, i, npage;
+ int nsegs, i, npage;
#endif
if (dev->sg)
@@ -116,10 +116,9 @@
return ENOMEM;
}
#elif defined(__NetBSD__)
- dmah = malloc(sizeof(struct drm_dma_handle)
- + (pages - 1) * sizeof(bus_dma_segment_t),
- DRM_MEM_DMA,
- M_ZERO | M_NOWAIT);
+ dmah = malloc(sizeof(struct drm_dma_handle) +
+ (pages - 1) * sizeof(bus_dma_segment_t),
+ DRM_MEM_DMA, M_ZERO | M_NOWAIT);
if (dmah == NULL) {
free(entry->busaddr, DRM_MEM_PAGES);
free(entry, DRM_MEM_SGLISTS);
@@ -128,68 +127,72 @@
dmah->tag = dev->pa.pa_dmat;
- if ((ret = bus_dmamem_alloc(dmah->tag, request->size, PAGE_SIZE,
- 0, dmah->segs, pages, &nsegs,
- BUS_DMA_WAITOK) != 0)) {
+ if ((ret = bus_dmamem_alloc(dmah->tag, request->size, PAGE_SIZE, 0,
+ dmah->segs, pages, &nsegs,
+ BUS_DMA_WAITOK) != 0)) {
printf("drm: Unable to allocate %lu bytes of DMA, error %d\n",
request->size, ret);
- dmah->tag = NULL;
+ dmah->tag = NULL;
free(dmah, DRM_MEM_DMA);
free(entry->busaddr, DRM_MEM_PAGES);
free(entry, DRM_MEM_SGLISTS);
- return ENOMEM;
+ return ENOMEM;
}
- DRM_DEBUG("nsegs = %d\n", nsegs);
- dmah->nsegs = nsegs;
- if ((ret = bus_dmamem_map(dmah->tag, dmah->segs, nsegs, request->size,
- &dmah->vaddr, BUS_DMA_NOWAIT | BUS_DMA_NOCACHE | BUS_DMA_COHERENT)) != 0) {
+ DRM_DEBUG("nsegs = %d\n", nsegs);
+ dmah->nsegs = nsegs;
+ if ((ret = bus_dmamem_map(dmah->tag, dmah->segs, nsegs, request->size,
+ &dmah->vaddr, BUS_DMA_NOWAIT |
+ BUS_DMA_NOCACHE | BUS_DMA_COHERENT)) != 0) {
printf("drm: Unable to map DMA, error %d\n", ret);
- bus_dmamem_free(dmah->tag, dmah->segs, dmah->nsegs);
- dmah->tag = NULL;
+ bus_dmamem_free(dmah->tag, dmah->segs, dmah->nsegs);
+ dmah->tag = NULL;
free(dmah, DRM_MEM_DMA);
- free(entry->busaddr, DRM_MEM_PAGES);
+ free(entry->busaddr, DRM_MEM_PAGES);
free(entry, DRM_MEM_SGLISTS);
- return ENOMEM;
+ return ENOMEM;
}
if ((ret = bus_dmamap_create(dmah->tag, request->size, nsegs,
- request->size, 0,
- BUS_DMA_NOWAIT, &dmah->map)) != 0) {
+ request->size, 0, BUS_DMA_NOWAIT,
+ &dmah->map)) != 0) {
printf("drm: Unable to create DMA map, error %d\n", ret);
- bus_dmamem_unmap(dmah->tag, dmah->vaddr, request->size);
- bus_dmamem_free(dmah->tag, dmah->segs, nsegs);
- dmah->tag = NULL;
+ bus_dmamem_unmap(dmah->tag, dmah->vaddr, request->size);
+ bus_dmamem_free(dmah->tag, dmah->segs, nsegs);
+ dmah->tag = NULL;
free(dmah, DRM_MEM_DMA);
- free(entry->busaddr, DRM_MEM_PAGES);
+ free(entry->busaddr, DRM_MEM_PAGES);
free(entry, DRM_MEM_SGLISTS);
- return ENOMEM;
+ return ENOMEM;
}
- if ((ret = bus_dmamap_load(dmah->tag, dmah->map, dmah->vaddr,
- request->size, NULL, BUS_DMA_NOWAIT | BUS_DMA_NOCACHE)) != 0) {
+ if ((ret = bus_dmamap_load(dmah->tag, dmah->map, dmah->vaddr,
+ request->size, NULL,
+ BUS_DMA_NOWAIT | BUS_DMA_NOCACHE)) != 0) {
printf("drm: Unable to load DMA map, error %d\n", ret);
- bus_dmamap_destroy(dmah->tag, dmah->map);
- bus_dmamem_unmap(dmah->tag, dmah->vaddr, request->size);
- bus_dmamem_free(dmah->tag, dmah->segs, dmah->nsegs);
- dmah->tag = NULL;
- free(dmah, DRM_MEM_DMA);
- return ENOMEM;
- }
- /*
- * We are expected to return address for each page here.
- * If bus_dmamem_alloc did not return each page in own segment
- * (likely not), split them as if they were separate segments.
- */
+ bus_dmamap_destroy(dmah->tag, dmah->map);
+ bus_dmamem_unmap(dmah->tag, dmah->vaddr, request->size);
+ bus_dmamem_free(dmah->tag, dmah->segs, dmah->nsegs);
+ dmah->tag = NULL;
+ free(dmah, DRM_MEM_DMA);
+ return ENOMEM;
+ }
+ /*
+ * We are expected to return address for each page here.
+ * If bus_dmamem_alloc did not return each page in own segment
+ * (likely not), split them as if they were separate segments.
+ */
for (i = 0, npage = 0 ; (i < nsegs) && (npage < pages) ; i++) {
- bus_addr_t base = dmah->map->dm_segs[i].ds_addr;
- bus_size_t offs;
- for (offs = 0 ; (offs + PAGE_SIZE <= dmah->map->dm_segs[i].ds_len)
- && (npage < pages) ; offs += PAGE_SIZE) {
- entry->busaddr[npage++] = base + offs;
- }
+ bus_addr_t base = dmah->map->dm_segs[i].ds_addr;
+ bus_size_t offs;
+
+ for (offs = 0;
+ (offs + PAGE_SIZE <= dmah->map->dm_segs[i].ds_len) &&
+ (npage < pages);
+ offs += PAGE_SIZE)
+ entry->busaddr[npage++] = base + offs;
}
- KASSERT(i == nsegs);
- KASSERT(npage == pages);
+ KASSERT(i == nsegs);
+ KASSERT(npage == pages);
dmah->size = request->size;
- memset(dmah->vaddr, 0, request->size);
+ memset(dmah->vaddr, 0, request->size);
#endif
entry->sg_dmah = dmah;
Index: src/sys/external/bsd/drm/dist/libdrm/xf86drm.c
diff -u src/sys/external/bsd/drm/dist/libdrm/xf86drm.c:1.1.1.2 src/sys/external/bsd/drm/dist/libdrm/xf86drm.c:1.2
--- src/sys/external/bsd/drm/dist/libdrm/xf86drm.c:1.1.1.2 Fri Jun 19 03:22:23 2009
+++ src/sys/external/bsd/drm/dist/libdrm/xf86drm.c Sat Jun 20 01:07:10 2009
@@ -63,7 +63,8 @@
#endif
#ifdef __NetBSD__
-#define DRM_MAJOR 34
+#undef DRM_MAJOR
+#define DRM_MAJOR 180
#endif
# ifdef __OpenBSD__
Index: src/sys/external/bsd/drm/dist/shared-core/drm.h
diff -u src/sys/external/bsd/drm/dist/shared-core/drm.h:1.1.1.2 src/sys/external/bsd/drm/dist/shared-core/drm.h:1.2
--- src/sys/external/bsd/drm/dist/shared-core/drm.h:1.1.1.2 Fri Jun 19 03:22:24 2009
+++ src/sys/external/bsd/drm/dist/shared-core/drm.h Sat Jun 20 01:07:10 2009
@@ -98,7 +98,10 @@
#ifdef __OpenBSD__
#define DRM_MAJOR 81
#endif
-#if defined(__linux__) || defined(__NetBSD__)
+#if defined(__NetBSD__)
+#define DRM_MAJOR 180
+#endif
+#if defined(__linux__)
#define DRM_MAJOR 226
#endif
#define DRM_MAX_MINOR 15
Index: src/sys/external/bsd/drm/dist/shared-core/i915_suspend.c
diff -u src/sys/external/bsd/drm/dist/shared-core/i915_suspend.c:1.4 src/sys/external/bsd/drm/dist/shared-core/i915_suspend.c:1.5
--- src/sys/external/bsd/drm/dist/shared-core/i915_suspend.c:1.4 Fri Jun 19 03:50:05 2009
+++ src/sys/external/bsd/drm/dist/shared-core/i915_suspend.c Sat Jun 20 01:07:10 2009
@@ -375,7 +375,7 @@
#if defined(__FreeBSD__)
pci_write_config(dev->device, LBB, dev_priv->saveLBB, 1);
#elif defined(__NetBSD__)
- pci_conf_write(dev->pa.pa_pc, dev->pa.pa_tag, LBB, dev_priv->saveLBB);
+ pci_conf_write(dev->pa.pa_pc, dev->pa.pa_tag, LBB, dev_priv->saveLBB);
#else
pci_write_config_byte(dev->pdev, LBB, dev_priv->saveLBB);
#endif
Index: src/sys/external/bsd/drm/dist/shared-core/radeon_cp.c
diff -u src/sys/external/bsd/drm/dist/shared-core/radeon_cp.c:1.4 src/sys/external/bsd/drm/dist/shared-core/radeon_cp.c:1.5
--- src/sys/external/bsd/drm/dist/shared-core/radeon_cp.c:1.4 Fri Jun 19 03:50:05 2009
+++ src/sys/external/bsd/drm/dist/shared-core/radeon_cp.c Sat Jun 20 01:07:10 2009
@@ -1569,7 +1569,8 @@
mtx_sleep(&ret, &dev->dev_lock, PZERO, "rdnrel",
1);
#elif defined(__NetBSD__)
- mtsleep(&ret, 0, "rdnrel", 1, &dev->dev_lock);
+ mtsleep(&ret, 0, "rdnrel", 1,
+ &dev->dev_lock);
#else
tsleep(&ret, PZERO, "rdnrel", 1);
#endif
@@ -1587,7 +1588,8 @@
mtx_sleep(&ret, &dev->dev_lock, PZERO, "rdnrel",
1);
#elif defined(__NetBSD__)
- mtsleep(&ret, 0, "rdnrel", 1, &dev->dev_lock);
+ mtsleep(&ret, 0, "rdnrel", 1,
+ &dev->dev_lock);
#else
tsleep(&ret, PZERO, "rdnrel", 1);
#endif
