Mesa (master): i915: Remove left-over drmUnmap()
Kristian Høgsberg
krh at kemper.freedesktop.org
Thu Feb 11 21:59:31 UTC 2010
Module: Mesa
Branch: master
Commit: fa43956b5ce6b48d29f973fc54bd77d1a11e32e4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fa43956b5ce6b48d29f973fc54bd77d1a11e32e4
Author: Kristian Høgsberg <krh at bitplanet.net>
Date: Thu Feb 11 16:34:11 2010 -0500
i915: Remove left-over drmUnmap()
---
src/mesa/drivers/dri/intel/intel_regions.c | 5 -----
src/mesa/drivers/dri/intel/intel_regions.h | 3 +--
2 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_regions.c b/src/mesa/drivers/dri/intel/intel_regions.c
index 301c3df..e2859e4 100644
--- a/src/mesa/drivers/dri/intel/intel_regions.c
+++ b/src/mesa/drivers/dri/intel/intel_regions.c
@@ -287,11 +287,6 @@ intel_region_release(struct intel_region **region_handle)
region->pbo = NULL;
dri_bo_unreference(region->buffer);
- if (region->classic_map != NULL) {
- drmUnmap(region->classic_map,
- region->pitch * region->cpp * region->height);
- }
-
free(region);
}
*region_handle = NULL;
diff --git a/src/mesa/drivers/dri/intel/intel_regions.h b/src/mesa/drivers/dri/intel/intel_regions.h
index 535fcd7..860ae11 100644
--- a/src/mesa/drivers/dri/intel/intel_regions.h
+++ b/src/mesa/drivers/dri/intel/intel_regions.h
@@ -52,7 +52,7 @@ struct intel_buffer_object;
*/
struct intel_region
{
- dri_bo *buffer; /**< buffer manager's buffer */
+ drm_intel_bo *buffer; /**< buffer manager's buffer */
GLuint refcount; /**< Reference count for region */
GLuint cpp; /**< bytes per pixel */
GLuint width; /**< in pixels */
@@ -66,7 +66,6 @@ struct intel_region
uint32_t tiling; /**< Which tiling mode the region is in */
uint32_t bit_6_swizzle; /**< GEM flag for address swizzling requirement */
- drmAddress classic_map; /**< drmMap of the region when not in GEM mode */
struct intel_buffer_object *pbo; /* zero-copy uploads */
};
More information about the mesa-commit
mailing list