i965/drm: Move _drm_bacon_context to intel_bufmgr_gem.c.

This moves us one step closer to killing off intel_bufmgr_priv.h.

We might want to nuke it altogether, since it's basically just a
uint32_t handle, but for now, let's focus on removing files.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>

diff --git a/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c b/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c
index be587ca9282d1b682f0a7e526ce35b60fc5e3dd3..d0395e7830712a9d3f8deb4ffb9a0d0aaf6309a5 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c
+++ b/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c
@@ -107,6 +107,11 @@ atomic_add_unless(int *v, int add, int unless)
  */
 #define lower_32_bits(n) ((__u32)(n))
 
+struct _drm_bacon_context {
+       unsigned int ctx_id;
+       struct _drm_bacon_bufmgr *bufmgr;
+};
+
 typedef struct _drm_bacon_bo_gem drm_bacon_bo_gem;
 
 struct drm_bacon_gem_bo_bucket {

diff --git a/src/mesa/drivers/dri/i965/intel_bufmgr_priv.h b/src/mesa/drivers/dri/i965/intel_bufmgr_priv.h
index 9f54606e5d176a9931cd19f57201764bf45b482a..cccb9e4a97248bd1d32238695ab43c3b699131ff 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_bufmgr_priv.h
+++ b/src/mesa/drivers/dri/i965/intel_bufmgr_priv.h
@@ -42,9 +42,4 @@
 struct _drm_bacon_bufmgr {
 };
 
-struct _drm_bacon_context {
-       unsigned int ctx_id;
-       struct _drm_bacon_bufmgr *bufmgr;
-};
-
 #endif /* INTEL_BUFMGR_PRIV_H */