From c3ddfea1a64b7aaaebfb429243c71feb0801da9d Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 29 Jun 2010 20:12:44 +0100 Subject: intel: Suppress the error return from setting domains after mapping. If the mapping succeeds we have a valid pointer. If setting the domain failures we may incur cache corruption. However the usual failure mode is because of a hung GPU, in which case it is preferable to ignore the minor error from setting the domain and continue on oblivious. If these errors persist, we should rate limit the warning [or even just remove it]. Signed-off-by: Chris Wilson --- intel/intel_bufmgr_gem.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'intel') diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c index 26dc3348..3446390c 100644 --- a/intel/intel_bufmgr_gem.c +++ b/intel/intel_bufmgr_gem.c @@ -1006,12 +1006,9 @@ static int drm_intel_gem_bo_map(drm_intel_bo *bo, int write_enable) &set_domain); } while (ret == -1 && errno == EINTR); if (ret != 0) { - ret = -errno; fprintf(stderr, "%s:%d: Error setting to CPU domain %d: %s\n", __FILE__, __LINE__, bo_gem->gem_handle, strerror(errno)); - pthread_mutex_unlock(&bufmgr_gem->lock); - return ret; } pthread_mutex_unlock(&bufmgr_gem->lock); @@ -1086,9 +1083,7 @@ int drm_intel_gem_bo_map_gtt(drm_intel_bo *bo) DRM_IOCTL_I915_GEM_SET_DOMAIN, &set_domain); } while (ret == -1 && errno == EINTR); - if (ret != 0) { - ret = -errno; fprintf(stderr, "%s:%d: Error setting domain %d: %s\n", __FILE__, __LINE__, bo_gem->gem_handle, strerror(errno)); @@ -1096,7 +1091,7 @@ int drm_intel_gem_bo_map_gtt(drm_intel_bo *bo) pthread_mutex_unlock(&bufmgr_gem->lock); - return ret; + return 0; } int drm_intel_gem_bo_unmap_gtt(drm_intel_bo *bo) -- cgit v1.2.3