From: Dave Airlie <airlied@linux.ie>
Date: Fri, 30 Sep 2005 03:39:02 +0000 (+0000)
Subject: fixup bens fix so it works..
X-Git-Tag: submit/1.0/20121108.012404~1610
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=856bdf0f673510c33a23b4c4d4fff91d95eb149e;p=profile%2Fivi%2Flibdrm.git

fixup bens fix so it works..
---

diff --git a/linux-core/drm_bufs.c b/linux-core/drm_bufs.c
index a2b79b2..e9e4a35 100644
--- a/linux-core/drm_bufs.c
+++ b/linux-core/drm_bufs.c
@@ -56,7 +56,8 @@ static drm_map_list_t *drm_find_matching_map(drm_device_t *dev,
 	list_for_each(list, &dev->maplist->head) {
 		drm_map_list_t *entry = list_entry(list, drm_map_list_t, head);
 		if (entry->map && map->type == entry->map->type &&
-		    entry->map->offset == map->offset) {
+		    ((entry->map->offset == map->offset) || 
+		     (map->type == _DRM_SHM && map->flags==_DRM_CONTAINS_LOCK))) {
 			return entry;
 		}
 	}
@@ -188,8 +189,8 @@ int drm_addmap_core(drm_device_t * dev, unsigned int offset,
 						      MTRR_TYPE_WRCOMB, 1);
 			}
 		}
-		//if (map->type == _DRM_REGISTERS)
-		map->handle = drm_ioremap(map->offset, map->size, dev);
+		if (map->type == _DRM_REGISTERS)
+			map->handle = drm_ioremap(map->offset, map->size, dev);
 		break;
 	case _DRM_SHM:
 		list = drm_find_matching_map(dev, map);