Wed Jul 24 03:04:34 2013 UTC ()

Add a default (panic) case to DRM_IS_BUS_SPACE_P in drmP.h.


(riastradh)

diff -r1.1.1.1.2.42 -r1.1.1.1.2.43 src/sys/external/bsd/drm2/dist/include/drm/drmP.h

--- src/sys/external/bsd/drm2/dist/include/drm/Attic/drmP.h 2013/07/24 02:54:09	1.1.1.1.2.42
+++ src/sys/external/bsd/drm2/dist/include/drm/Attic/drmP.h 2013/07/24 03:04:34	1.1.1.1.2.43

 @@ -2036,26 +2036,29 @@ DRM_IS_BUS_SPACE(struct drm_local_map *m
 		/*
 		 * XXX Old drm uses bus space access for this, but
 		 * consistent maps don't have bus space handles!  They
 		 * do, however, have kernel virtual addresses in the
 		 * map->handle, so maybe that's right.
 		 */
 #if 0
 		return false;
 #endif
 		panic("I don't know how to access drm consistent memory!");
 	case _DRM_GEM:
 		panic("I don't know how to access drm gem memory!");
 	default:
 		panic("I don't know what kind of memory you mean!");
+	}
+}
 static inline uint8_t
 DRM_READ8(struct drm_local_map *map, bus_size_t offset)
+{
 	if (DRM_IS_BUS_SPACE(map))
 		return bus_space_read_1(map->lm_data.bus_space.bst,
 		    map->lm_data.bus_space.bsh, offset);
 	else
 		return *(volatile uint8_t *)((vaddr_t)map->handle + offset);
+}