intel: Drop silly asserts on mappings present at unmap time.
The intent of these was to catch mismatched map/unmap. What it actually did was check whether there was ever a mapping of that type (including in a previous life of the buffer through the userland BO cache), not whether they were mismatched. We don't even actually want to catch mismatched map/unmap, unless we also do refcounting, since at one point Mesa would do map/map/use/unmap/unmap. Just remove this code instead.main
parent
4abb65f95c
commit
a52e61b5c8
|
@ -1087,14 +1087,11 @@ int drm_intel_gem_bo_map_gtt(drm_intel_bo *bo)
|
||||||
int drm_intel_gem_bo_unmap_gtt(drm_intel_bo *bo)
|
int drm_intel_gem_bo_unmap_gtt(drm_intel_bo *bo)
|
||||||
{
|
{
|
||||||
drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
|
drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
|
||||||
drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
|
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
if (bo == NULL)
|
if (bo == NULL)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
assert(bo_gem->gtt_virtual != NULL);
|
|
||||||
|
|
||||||
pthread_mutex_lock(&bufmgr_gem->lock);
|
pthread_mutex_lock(&bufmgr_gem->lock);
|
||||||
bo->virtual = NULL;
|
bo->virtual = NULL;
|
||||||
pthread_mutex_unlock(&bufmgr_gem->lock);
|
pthread_mutex_unlock(&bufmgr_gem->lock);
|
||||||
|
@ -1112,8 +1109,6 @@ static int drm_intel_gem_bo_unmap(drm_intel_bo *bo)
|
||||||
if (bo == NULL)
|
if (bo == NULL)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
assert(bo_gem->mem_virtual != NULL);
|
|
||||||
|
|
||||||
pthread_mutex_lock(&bufmgr_gem->lock);
|
pthread_mutex_lock(&bufmgr_gem->lock);
|
||||||
|
|
||||||
/* Cause a flush to happen if the buffer's pinned for scanout, so the
|
/* Cause a flush to happen if the buffer's pinned for scanout, so the
|
||||||
|
|
Loading…
Reference in New Issue