diff options
| author | Jakob Bornecrantz <jakob@vmware.com> | 2010-01-05 20:59:24 +0100 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@vmware.com> | 2010-01-05 20:59:24 +0100 |
| commit | 2f7f7ceccab4176217c399502b3ff95df1517627 (patch) | |
| tree | 1a9f6e6c8ebcf5b13d9877685fce91b87a971ed2 /intel | |
| parent | d6059c3dd1300662e941ccd5e55649534fbb9a63 (diff) | |
| parent | 6d3b8bbddd44b42d89adb1aafb7645e7f802673a (diff) | |
Merge branch 'master' into libkms-master
Conflicts:
configure.ac
Diffstat (limited to 'intel')
| -rw-r--r-- | intel/intel_bufmgr_gem.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c index 5b76340a..f3af3a96 100644 --- a/intel/intel_bufmgr_gem.c +++ b/intel/intel_bufmgr_gem.c @@ -950,6 +950,7 @@ int drm_intel_gem_bo_map_gtt(drm_intel_bo *bo) MAP_SHARED, bufmgr_gem->fd, mmap_arg.offset); if (bo_gem->gtt_virtual == MAP_FAILED) { + bo_gem->gtt_virtual = NULL; ret = -errno; fprintf(stderr, "%s:%d: Error mapping buffer %d (%s): %s .\n", |