summaryrefslogtreecommitdiff
path: root/src/gallium/winsys/i915/drm/i915_drm_winsys.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2010-11-19 23:38:23 +0100
committerJakob Bornecrantz <wallbraker@gmail.com>2010-11-21 16:41:19 +0100
commitc8fca58d9d5b3f25cb1ac2056ac2b437b79c04ee (patch)
tree12bf0c9adf14c129774c5a11d68218ec93726cf5 /src/gallium/winsys/i915/drm/i915_drm_winsys.c
parente18261885334522bcb2cce6e4a2ac7c509a7e3c0 (diff)
i915g: kill idws->pool
The drm winsys only ever handles one gem memory manager. Rip out the unnecessary complication. Reviewed-by: Jakob Bornecrantz <wallbraker@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Jakob Bornecrantz <wallbraker@gmail.com>
Diffstat (limited to 'src/gallium/winsys/i915/drm/i915_drm_winsys.c')
-rw-r--r--src/gallium/winsys/i915/drm/i915_drm_winsys.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/winsys/i915/drm/i915_drm_winsys.c b/src/gallium/winsys/i915/drm/i915_drm_winsys.c
index 179a84a704b..cc0b6a99577 100644
--- a/src/gallium/winsys/i915/drm/i915_drm_winsys.c
+++ b/src/gallium/winsys/i915/drm/i915_drm_winsys.c
@@ -40,7 +40,7 @@ i915_drm_winsys_destroy(struct i915_winsys *iws)
{
struct i915_drm_winsys *idws = i915_drm_winsys(iws);
- drm_intel_bufmgr_destroy(idws->pools.gem);
+ drm_intel_bufmgr_destroy(idws->gem_manager);
FREE(idws);
}
@@ -67,8 +67,8 @@ i915_drm_winsys_create(int drmFD)
idws->base.destroy = i915_drm_winsys_destroy;
- idws->pools.gem = drm_intel_bufmgr_gem_init(idws->fd, idws->max_batch_size);
- drm_intel_bufmgr_gem_enable_reuse(idws->pools.gem);
+ idws->gem_manager = drm_intel_bufmgr_gem_init(idws->fd, idws->max_batch_size);
+ drm_intel_bufmgr_gem_enable_reuse(idws->gem_manager);
idws->dump_cmd = debug_get_bool_option("I915_DUMP_CMD", FALSE);
idws->send_cmd = !debug_get_bool_option("I915_NO_HW", FALSE);