gma500: Move our other GEM helper into the bits want to push into GEM (eee9b52e) · Commits · 戴 / test

drivers/staging/gma500/gem_glue.c

+54 −0

Original line number	Diff line number	Diff line
		@@ -45,3 +45,57 @@ void drm_gem_object_release_wrap(struct drm_gem_object *obj)
		if (obj->filp)
		drm_gem_object_release(obj);
		}

		/**
		* gem_create_mmap_offset - invent an mmap offset
		* @obj: our object
		*
		* Standard implementation of offset generation for mmap as is
		* duplicated in several drivers. This belongs in GEM.
		*/
		int gem_create_mmap_offset(struct drm_gem_object *obj)
		{
		struct drm_device *dev = obj->dev;
		struct drm_gem_mm *mm = dev->mm_private;
		struct drm_map_list *list;
		struct drm_local_map *map;
		int ret;

		list = &obj->map_list;
		list->map = kzalloc(sizeof(struct drm_map_list), GFP_KERNEL);
		if (list->map == NULL)
		return -ENOMEM;
		map = list->map;
		map->type = _DRM_GEM;
		map->size = obj->size;
		map->handle = obj;

		list->file_offset_node = drm_mm_search_free(&mm->offset_manager,
		obj->size / PAGE_SIZE, 0, 0);
		if (!list->file_offset_node) {
		dev_err(dev->dev, "failed to allocate offset for bo %d\n",
		obj->name);
		ret = -ENOSPC;
		goto free_it;
		}
		list->file_offset_node = drm_mm_get_block(list->file_offset_node,
		obj->size / PAGE_SIZE, 0);
		if (!list->file_offset_node) {
		ret = -ENOMEM;
		goto free_it;
		}
		list->hash.key = list->file_offset_node->start;
		ret = drm_ht_insert_item(&mm->offset_hash, &list->hash);
		if (ret) {
		dev_err(dev->dev, "failed to add to map hash\n");
		goto free_mm;
		}
		return 0;

		free_mm:
		drm_mm_put_block(list->file_offset_node);
		free_it:
		kfree(list->map);
		list->map = NULL;
		return ret;
		}

drivers/staging/gma500/gem_glue.h

+1 −1

Original line number	Diff line number	Diff line
		extern void drm_gem_object_release_wrap(struct drm_gem_object *obj);
		extern int drm_gem_private_object_init(struct drm_device *dev,
		struct drm_gem_object *obj, size_t size);

		extern int gem_create_mmap_offset(struct drm_gem_object *obj);

drivers/staging/gma500/psb_gem.c

+1 −55

Original line number	Diff line number	Diff line
		@@ -60,60 +60,6 @@ int psb_gem_get_aperture(struct drm_device dev, void data,
		return -EINVAL;
		}

		/**
		* psb_gem_create_mmap_offset - invent an mmap offset
		* @obj: our object
		*
		* This is basically doing by hand a pile of ugly crap which should
		* be done automatically by the GEM library code but isn't
		*/
		static int psb_gem_create_mmap_offset(struct drm_gem_object *obj)
		{
		struct drm_device *dev = obj->dev;
		struct drm_gem_mm *mm = dev->mm_private;
		struct drm_map_list *list;
		struct drm_local_map *map;
		int ret;

		list = &obj->map_list;
		list->map = kzalloc(sizeof(struct drm_map_list), GFP_KERNEL);
		if (list->map == NULL)
		return -ENOMEM;
		map = list->map;
		map->type = _DRM_GEM;
		map->size = obj->size;
		map->handle = obj;

		list->file_offset_node = drm_mm_search_free(&mm->offset_manager,
		obj->size / PAGE_SIZE, 0, 0);
		if (!list->file_offset_node) {
		dev_err(dev->dev, "failed to allocate offset for bo %d\n",
		obj->name);
		ret = -ENOSPC;
		goto free_it;
		}
		list->file_offset_node = drm_mm_get_block(list->file_offset_node,
		obj->size / PAGE_SIZE, 0);
		if (!list->file_offset_node) {
		ret = -ENOMEM;
		goto free_it;
		}
		list->hash.key = list->file_offset_node->start;
		ret = drm_ht_insert_item(&mm->offset_hash, &list->hash);
		if (ret) {
		dev_err(dev->dev, "failed to add to map hash\n");
		goto free_mm;
		}
		return 0;

		free_mm:
		drm_mm_put_block(list->file_offset_node);
		free_it:
		kfree(list->map);
		list->map = NULL;
		return ret;
		}

		/**
		* psb_gem_dumb_map_gtt - buffer mapping for dumb interface
		* @file: our drm client file
		@@ -144,7 +90,7 @@ int psb_gem_dumb_map_gtt(struct drm_file file, struct drm_device dev,

		/* Make it mmapable */
		if (!obj->map_list.map) {
		ret = psb_gem_create_mmap_offset(obj);
		ret = gem_create_mmap_offset(obj);
		if (ret)
		goto out;
		}

Admin message