Remove and shuffle some includes to reduce their number since drmP.h

is included by a lot of files.

4 files changed, 17 insertions, 22 deletions

diff --git a/sys/dev/pci/drm/drmP.h b/sys/dev/pci/drm/drmP.h
index 42f6dfedf7f..e1c5d9df8cf 100644
--- a/sys/dev/pci/drm/drmP.h
+++ b/sys/dev/pci/drm/drmP.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: drmP.h,v 1.172 2014/03/24 17:06:49 kettenis Exp $ */
+/* $OpenBSD: drmP.h,v 1.173 2014/03/25 17:44:39 mpi Exp $ */
 /* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*-
  * Created: Mon Jan  4 10:05:05 1999 by faith@precisioninsight.com
  */
@@ -44,28 +44,21 @@
 #include <sys/pool.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
-#include <sys/stat.h>
 #include <sys/proc.h>
-#include <sys/resource.h>
-#include <sys/resourcevar.h>
+#include <sys/conf.h>
 #include <sys/mutex.h>
-#include <sys/fcntl.h>
-#include <sys/filio.h>
-#include <sys/signalvar.h>
-#include <sys/poll.h>
 #include <sys/tree.h>
 #include <sys/endian.h>
-#include <sys/mman.h>
 #include <sys/stdint.h>
 #include <sys/memrange.h>
 #include <sys/extent.h>
-#include <sys/vnode.h>
-#include <uvm/uvm.h>
+
+#include <uvm/uvm_extern.h>
+#include <uvm/uvm_object.h>
+
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/agpvar.h>
-#include <dev/pci/vga_pcivar.h>
 #include <machine/bus.h>
 
 #include "drm_linux_list.h"
@@ -646,9 +639,6 @@ struct drm_gem_object {
 #define	DRM_BUSY	0x00000001
 #define	DRM_WANTED	0x00000002
 	u_int				 do_flags;
-#ifdef DRMLOCKDEBUG			/* to tell owner */
-	struct proc			*holding_proc;
-#endif
 	uint32_t			 read_domains;
 	uint32_t			 write_domain;
 
diff --git a/sys/dev/pci/drm/drm_drv.c b/sys/dev/pci/drm/drm_drv.c
index 31b4812ce66..ed8ffb0ee40 100644
--- a/sys/dev/pci/drm/drm_drv.c
+++ b/sys/dev/pci/drm/drm_drv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: drm_drv.c,v 1.125 2014/03/13 12:45:04 kettenis Exp $ */
+/* $OpenBSD: drm_drv.c,v 1.126 2014/03/25 17:44:39 mpi Exp $ */
 /*-
  * Copyright 2007-2009 Owain G. Ainsworth <oga@openbsd.org>
  * Copyright © 2008 Intel Corporation
@@ -41,14 +41,18 @@
  */
 
 #include <sys/param.h>
+#include <sys/fcntl.h>
+#include <sys/filio.h>
 #include <sys/limits.h>
+#include <sys/poll.h>
 #include <sys/specdev.h>
 #include <sys/systm.h>
+#include <sys/ttycom.h> /* for TIOCSGRP */
+#include <sys/vnode.h>
+
 #include <uvm/uvm.h>
 #include <uvm/uvm_device.h>
 
-#include <sys/ttycom.h> /* for TIOCSGRP */
-
 #include "drmP.h"
 #include "drm.h"
 #include "drm_sarea.h"
diff --git a/sys/dev/pci/drm/i915/i915_drv.h b/sys/dev/pci/drm/i915/i915_drv.h
index d084df31ca6..acb34f051f8 100644
--- a/sys/dev/pci/drm/i915/i915_drv.h
+++ b/sys/dev/pci/drm/i915/i915_drv.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: i915_drv.h,v 1.50 2014/02/19 01:20:12 jsg Exp $ */
+/* $OpenBSD: i915_drv.h,v 1.51 2014/03/25 17:44:39 mpi Exp $ */
 /* i915_drv.h -- Private header for the I915 driver -*- linux-c -*-
  */
 /*
@@ -37,6 +37,7 @@
 #include "intel_ringbuffer.h"
 
 #include <sys/task.h>
+#include <dev/pci/vga_pcivar.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/rasops/rasops.h>
diff --git a/sys/dev/pci/drm/ttm/ttm_page_alloc.c b/sys/dev/pci/drm/ttm/ttm_page_alloc.c
index a0489d215e2..9da7fba7585 100644
--- a/sys/dev/pci/drm/ttm/ttm_page_alloc.c
+++ b/sys/dev/pci/drm/ttm/ttm_page_alloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ttm_page_alloc.c,v 1.4 2014/02/24 21:36:49 kettenis Exp $	*/
+/*	$OpenBSD: ttm_page_alloc.c,v 1.5 2014/03/25 17:44:39 mpi Exp $	*/
 /*
  * Copyright (c) Red Hat Inc.
 
@@ -43,7 +43,7 @@
 #include <dev/pci/agpvar.h>
 #endif
 
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
 
 #define NUM_PAGES_TO_ALLOC		(PAGE_SIZE/sizeof(struct vm_page *))
 #define SMALL_ALLOCATION		16