vmwgfx: Build and Run on CentOS 6.5 and vanilla linux 2.6.35

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Acked-by: Sinclair Yeh <syeh@vmware.com>

14 files changed, 20 insertions, 6 deletions

diff --git a/ttm/ttm_bo.c b/ttm/ttm_bo.c
index 8717613..6dd6967 100644
--- a/ttm/ttm_bo.c
+++ b/ttm/ttm_bo.c
@@ -29,6 +29,7 @@
  */
 
 #define pr_fmt(fmt) "[TTM] " fmt
+#include "vmwgfx_compat.h"
 #include "ttm/ttm_module.h"
 #include "ttm/ttm_bo_driver.h"
 #include "ttm/ttm_placement.h"
diff --git a/ttm/ttm_bo_api.h b/ttm/ttm_bo_api.h
index 4c9024e..24466bf 100644
--- a/ttm/ttm_bo_api.h
+++ b/ttm/ttm_bo_api.h
@@ -32,7 +32,6 @@
 #define _TTM_BO_API_H_
 
 #include "drm_hashtab.h"
-#include "vmwgfx_compat.h"
 #include "drm_vma_manager.h"
 #include <linux/kref.h>
 #include <linux/list.h>
diff --git a/ttm/ttm_bo_driver.h b/ttm/ttm_bo_driver.h
index 66484b0..22a618b 100644
--- a/ttm/ttm_bo_driver.h
+++ b/ttm/ttm_bo_driver.h
@@ -40,7 +40,7 @@
 #include "linux/workqueue.h"
 #include "linux/fs.h"
 #include "linux/spinlock.h"
-#include "linux/reservation.h"
+#include "core/reservation.h"
 
 struct ttm_backend_func {
 	/**
@@ -1039,6 +1039,7 @@ extern pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp);
 
 extern const struct ttm_mem_type_manager_func ttm_bo_manager_func;
 
+#ifndef VMWGFX_STANDALONE
 #if IS_ENABLED(CONFIG_AGP)
 #include <linux/agp_backend.h>
 
@@ -1063,5 +1064,6 @@ extern struct ttm_tt *ttm_agp_tt_create(struct ttm_bo_device *bdev,
 int ttm_agp_tt_populate(struct ttm_tt *ttm);
 void ttm_agp_tt_unpopulate(struct ttm_tt *ttm);
 #endif
+#endif
 
 #endif
diff --git a/ttm/ttm_bo_manager.c b/ttm/ttm_bo_manager.c
index 235e1dd..fca3107 100644
--- a/ttm/ttm_bo_manager.c
+++ b/ttm/ttm_bo_manager.c
@@ -27,6 +27,7 @@
 /*
  * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
  */
+#include "vmwgfx_compat.h"
 
 #include "ttm/ttm_module.h"
 #include "ttm/ttm_bo_driver.h"
diff --git a/ttm/ttm_bo_util.c b/ttm/ttm_bo_util.c
index 3264221..2277aec 100644
--- a/ttm/ttm_bo_util.c
+++ b/ttm/ttm_bo_util.c
@@ -28,6 +28,7 @@
  * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
  */
 
+#include "vmwgfx_compat.h"
 #include "ttm/ttm_bo_driver.h"
 #include "ttm/ttm_placement.h"
 #include "drm_vma_manager.h"
diff --git a/ttm/ttm_bo_vm.c b/ttm/ttm_bo_vm.c
index e0f856c..ed53ff2 100644
--- a/ttm/ttm_bo_vm.c
+++ b/ttm/ttm_bo_vm.c
@@ -30,12 +30,12 @@
 
 #define pr_fmt(fmt) "[TTM] " fmt
 
+#include "vmwgfx_compat.h"
 #include <ttm/ttm_module.h>
 #include <ttm/ttm_bo_driver.h>
 #include <ttm/ttm_placement.h>
 #include "drm_vma_manager.h"
 #include <linux/mm.h>
-#include "vmwgfx_compat.h"
 #include <linux/rbtree.h>
 #include <linux/module.h>
 #include <linux/uaccess.h>
diff --git a/ttm/ttm_execbuf_util.c b/ttm/ttm_execbuf_util.c
index f9646e8..4df752c 100644
--- a/ttm/ttm_execbuf_util.c
+++ b/ttm/ttm_execbuf_util.c
@@ -24,6 +24,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  **************************************************************************/
+#include "vmwgfx_compat.h"
 
 #include "ttm/ttm_execbuf_util.h"
 #include "ttm/ttm_bo_driver.h"
diff --git a/ttm/ttm_memory.c b/ttm/ttm_memory.c
index a299036..d7db9a3 100644
--- a/ttm/ttm_memory.c
+++ b/ttm/ttm_memory.c
@@ -26,6 +26,8 @@
  **************************************************************************/
 
 #define pr_fmt(fmt) "[TTM] " fmt
+#include "vmwgfx_compat.h"
+
 #include "ttm/ttm_memory.h"
 #include "ttm/ttm_module.h"
 #include "ttm/ttm_page_alloc.h"
diff --git a/ttm/ttm_module.h b/ttm/ttm_module.h
index 08c50c1..45fa318 100644
--- a/ttm/ttm_module.h
+++ b/ttm/ttm_module.h
@@ -32,7 +32,6 @@
 #define _TTM_MODULE_H_
 
 #include <linux/kernel.h>
-#include "vmwgfx_compat.h"
 struct kobject;
 
 #define TTM_PFX "[TTM] "
diff --git a/ttm/ttm_object.c b/ttm/ttm_object.c
index f67085a..a77af13 100644
--- a/ttm/ttm_object.c
+++ b/ttm/ttm_object.c
@@ -57,6 +57,8 @@
  */
 
 #define pr_fmt(fmt) "[TTM] " fmt
+#include "vmwgfx_compat.h"
+
 #include "ttm/ttm_object.h"
 #include "ttm/ttm_module.h"
 #include <linux/list.h>
@@ -64,7 +66,6 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <asm/atomic.h>
-#include "vmwgfx_compat.h"
 
 struct ttm_object_file {
 	struct ttm_object_device *tdev;
diff --git a/ttm/ttm_object.h b/ttm/ttm_object.h
index 4bf7d9d..08fb4ef 100644
--- a/ttm/ttm_object.h
+++ b/ttm/ttm_object.h
@@ -42,11 +42,12 @@
 #include "drm_hashtab.h"
 #include <linux/kref.h>
 #include <ttm/ttm_memory.h>
-#include "vmwgfx_compat.h"
 #ifndef TTM_STANDALONE
 #include <linux/dma-buf.h>
 #endif
 
+struct dma_buf_ops;
+
 /**
  * enum ttm_ref_type
  *
diff --git a/ttm/ttm_page_alloc.c b/ttm/ttm_page_alloc.c
index 421434d..b5710a6 100644
--- a/ttm/ttm_page_alloc.c
+++ b/ttm/ttm_page_alloc.c
@@ -32,6 +32,7 @@
  */
 
 #define pr_fmt(fmt) "[TTM] " fmt
+#include "vmwgfx_compat.h"
 
 #include <linux/list.h>
 #include <linux/spinlock.h>
@@ -48,9 +49,11 @@
 #include "ttm/ttm_bo_driver.h"
 #include "ttm/ttm_page_alloc.h"
 
+#ifndef VMWGFX_STANDALONE
 #if IS_ENABLED(CONFIG_AGP)
 #include <asm/agp.h>
 #endif
+#endif
 
 #define NUM_PAGES_TO_ALLOC		(PAGE_SIZE/sizeof(struct page *))
 #define SMALL_ALLOCATION		16
diff --git a/ttm/ttm_page_alloc.h b/ttm/ttm_page_alloc.h
index aa80f47..0cd3b17 100644
--- a/ttm/ttm_page_alloc.h
+++ b/ttm/ttm_page_alloc.h
@@ -30,6 +30,8 @@
 #include "ttm_memory.h"
 
 struct device;
+struct ttm_tt;
+struct ttm_dma_tt;
 
 /**
  * Initialize pool allocator.
diff --git a/ttm/ttm_tt.c b/ttm/ttm_tt.c
index f00d272..3414ded 100644
--- a/ttm/ttm_tt.c
+++ b/ttm/ttm_tt.c
@@ -38,6 +38,7 @@
 #include <linux/swap.h>
 #include <linux/slab.h>
 #include <linux/export.h>
+#include "vmwgfx_compat.h"
 #include "drm_cache.h"
 #include "drm_mem_util.h"
 #include "ttm/ttm_module.h"