diff --git a/bsd/drm/Makefile b/bsd/drm/Makefile
index dd1d0359..dddb9954 100644
--- a/bsd/drm/Makefile
+++ b/bsd/drm/Makefile
@@ -5,7 +5,7 @@ SRCS	= init.c memory.c auth.c context.c drawable.c bufs.c \
 	  lists.c lock.c ioctl.c fops.c vm.c dma.c sysctl.c  \
 	  agpsupport.c ctxbitmap.c
 SRCS   += device_if.h bus_if.h pci_if.h
-CFLAGS += ${DEBUG_FLAGS} -I.. # -DDRM_AGP
+CFLAGS += ${DEBUG_FLAGS} -I.. -DDRM_AGP
 
 @:
 	ln -sf /sys @
diff --git a/bsd/drm/agpsupport.c b/bsd/drm/agpsupport.c
index 53444c90..e02e6bbd 100644
--- a/bsd/drm/agpsupport.c
+++ b/bsd/drm/agpsupport.c
@@ -238,8 +238,8 @@ drm_agp_head_t *drm_agp_init(void)
 	if (agp_available) {
 		if (!(head = drm_alloc(sizeof(*head), DRM_MEM_AGPLISTS)))
 			return NULL;
-		head->agpdev = agpdev;
 		memset((void *)head, 0, sizeof(*head));
+		head->agpdev = agpdev;
 		agp_get_info(agpdev, &head->info);
 		head->memory = NULL;
 #if 0				/* bogus */