Module Name: src
Committed By: riastradh
Date: Wed Apr 29 04:38:56 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_bufs.c
src/sys/external/bsd/drm2/dist/include/drm: drmP.h
src/sys/external/bsd/drm2/drm: drm_memory.c
src/sys/external/bsd/drm2/pci: drm_pci.c
Log Message:
Replace drm_ioremap by drm_core_ioremap, reducing diff a little.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/dist/drm/drm_bufs.c
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/drm/drm_memory.c
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/pci/drm_pci.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/drm2/dist/drm/drm_bufs.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_bufs.c:1.6 src/sys/external/bsd/drm2/dist/drm/drm_bufs.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/drm_bufs.c:1.6 Wed Jul 16 20:56:24 2014
+++ src/sys/external/bsd/drm2/dist/drm/drm_bufs.c Wed Apr 29 04:38:55 2015
@@ -213,7 +213,7 @@ static int drm_addmap_core(struct drm_de
}
if (map->type == _DRM_REGISTERS) {
#ifdef __NetBSD__
- map->handle = drm_ioremap(dev, map);
+ drm_core_ioremap(map, dev);
#else
if (map->flags & _DRM_WRITE_COMBINING)
map->handle = ioremap_wc(map->offset,
@@ -351,7 +351,7 @@ static int drm_addmap_core(struct drm_de
if (!list) {
if (map->type == _DRM_REGISTERS)
#ifdef __NetBSD__
- drm_iounmap(dev, map);
+ drm_core_ioremapfree(map, dev);
#else
iounmap(map->handle);
#endif
@@ -372,7 +372,7 @@ static int drm_addmap_core(struct drm_de
if (ret) {
if (map->type == _DRM_REGISTERS)
#ifdef __NetBSD__ /* XXX What about other map types...? */
- drm_iounmap(dev, map);
+ drm_core_ioremapfree(map, dev);
#else
iounmap(map->handle);
#endif
@@ -494,7 +494,7 @@ int drm_rmmap_locked(struct drm_device *
switch (map->type) {
case _DRM_REGISTERS:
#ifdef __NetBSD__
- drm_iounmap(dev, map);
+ drm_core_ioremapfree(map, dev);
#else
iounmap(map->handle);
#endif
Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.10 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.11
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.10 Fri Mar 6 01:24:24 2015
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Wed Apr 29 04:38:55 2015
@@ -1437,9 +1437,7 @@ extern unsigned int drm_poll(struct file
/* Memory management support (drm_memory.h) */
#include <drm/drm_memory.h>
-#ifdef __NetBSD__ /* XXX move to drm_memory.h */
-extern void *drm_ioremap(struct drm_device *dev, struct drm_local_map *map);
-extern void drm_iounmap(struct drm_device *dev, struct drm_local_map *map);
+#ifdef __NetBSD__
extern int drm_limit_dma_space(struct drm_device *, resource_size_t,
resource_size_t);
#endif
Index: src/sys/external/bsd/drm2/drm/drm_memory.c
diff -u src/sys/external/bsd/drm2/drm/drm_memory.c:1.6 src/sys/external/bsd/drm2/drm/drm_memory.c:1.7
--- src/sys/external/bsd/drm2/drm/drm_memory.c:1.6 Wed Jul 16 20:56:25 2014
+++ src/sys/external/bsd/drm2/drm/drm_memory.c Wed Apr 29 04:38:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_memory.c,v 1.6 2014/07/16 20:56:25 riastradh Exp $ */
+/* $NetBSD: drm_memory.c,v 1.7 2015/04/29 04:38:55 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.6 2014/07/16 20:56:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.7 2015/04/29 04:38:55 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "agp_i810.h"
@@ -74,8 +74,8 @@ drm_bus_borrow(bus_addr_t base, bus_size
return false;
}
-void *
-drm_ioremap(struct drm_device *dev, struct drm_local_map *map)
+void
+drm_core_ioremap(struct drm_local_map *map, struct drm_device *dev)
{
const bus_space_tag_t bst = dev->bst;
unsigned int unit;
@@ -125,19 +125,20 @@ drm_ioremap(struct drm_device *dev, stru
}
/* Failure! */
- return NULL;
+ return;
win: map->lm_data.bus_space.bst = bst;
- return bus_space_vaddr(bst, map->lm_data.bus_space.bsh);
+ map->handle = bus_space_vaddr(bst, map->lm_data.bus_space.bsh);
}
void
-drm_iounmap(struct drm_device *dev, struct drm_local_map *map)
+drm_core_ioremapfree(struct drm_local_map *map, struct drm_device *dev)
{
if (map->lm_data.bus_space.bus_map != NULL) {
bus_space_unmap(map->lm_data.bus_space.bst,
map->lm_data.bus_space.bsh, map->size);
map->lm_data.bus_space.bus_map = NULL;
+ map->handle = NULL;
}
}
Index: src/sys/external/bsd/drm2/pci/drm_pci.c
diff -u src/sys/external/bsd/drm2/pci/drm_pci.c:1.12 src/sys/external/bsd/drm2/pci/drm_pci.c:1.13
--- src/sys/external/bsd/drm2/pci/drm_pci.c:1.12 Fri Mar 6 13:44:18 2015
+++ src/sys/external/bsd/drm2/pci/drm_pci.c Wed Apr 29 04:38:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_pci.c,v 1.12 2015/03/06 13:44:18 riastradh Exp $ */
+/* $NetBSD: drm_pci.c,v 1.13 2015/04/29 04:38:55 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.12 2015/03/06 13:44:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.13 2015/04/29 04:38:55 riastradh Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -140,7 +140,7 @@ drm_pci_attach(device_t self, const stru
continue;
}
- /* Inquire about it. We'll map it in drm_ioremap. */
+ /* Inquire about it. We'll map it in drm_core_ioremap. */
if (pci_mapreg_info(pa->pa_pc, pa->pa_tag, reg, type,
&bm->bm_base, &bm->bm_size, &bm->bm_flags) != 0) {
aprint_debug_dev(self, "map %u failed\n", unit);
