From 3673b89bf32414be4c17e4f8c5d3fffc91c2d3b5 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Thu, 30 Mar 2017 14:59:23 -0700 Subject: [PATCH] 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 Acked-by: Jason Ekstrand --- src/mesa/drivers/dri/i965/intel_bufmgr_gem.c | 5 +++++ src/mesa/drivers/dri/i965/intel_bufmgr_priv.h | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c b/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c index be587ca9282..d0395e78307 100644 --- 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 9f54606e5d1..cccb9e4a972 100644 --- 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 */ -- 2.30.2