gma500: enable GEM mmap (0c4ac072) · Commits · 戴 / test

drivers/staging/gma500/psb_drv.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1403,7 +1403,7 @@ static struct drm_driver driver = {
		.open = drm_open,
		.release = drm_release,
		.unlocked_ioctl = psb_unlocked_ioctl,
		.mmap = drm_mmap,
		.mmap = drm_gem_mmap,
		.poll = drm_poll,
		.fasync = drm_fasync,
		.read = drm_read,

drivers/staging/gma500/psb_gem.c

+82 −4

Original line number	Diff line number	Diff line
		@@ -41,6 +41,15 @@ void psb_gem_free_object(struct drm_gem_object *obj)
		{
		struct gtt_range *gtt = container_of(obj, struct gtt_range, gem);
		psb_gtt_free_range(obj->dev, gtt);
		if (obj->map_list.map) {
		/* Do things GEM should do for us */
		struct drm_gem_mm *mm = obj->dev->mm_private;
		struct drm_map_list *list = &obj->map_list;
		drm_ht_remove_item(&mm->offset_hash, &list->hash);
		drm_mm_put_block(list->file_offset_node);
		kfree(list->map);
		list->map = NULL;
		}
		drm_gem_object_release(obj);
		}

		@@ -50,6 +59,59 @@ 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) {
		DRM_ERROR("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) {
		DRM_ERROR("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
		@@ -62,19 +124,35 @@ int psb_gem_get_aperture(struct drm_device dev, void data,
		int psb_gem_dumb_map_gtt(struct drm_file file, struct drm_device dev,
		uint32_t handle, uint64_t *offset)
		{
		int ret = 0;
		struct drm_gem_object *obj;

		if (!(dev->driver->driver_features & DRIVER_GEM))
		return -ENODEV;

		mutex_lock(&dev->struct_mutex);

		/* GEM does all our handle to object mapping */
		obj = drm_gem_object_lookup(dev, file, handle);
		if (obj == NULL)
		return -ENOENT;
		if (obj == NULL) {
		ret = -ENOENT;
		goto unlock;
		}
		/* What validation is needed here ? */

		/* GEM works out the hash offsets for us */
		/* Make it mmapable */
		if (!obj->map_list.map) {
		ret = psb_gem_create_mmap_offset(obj);
		if (ret)
		goto out;
		}
		/* GEM should really work out the hash offsets for us */
		*offset = (u64)obj->map_list.hash.key << PAGE_SHIFT;
		out:
		drm_gem_object_unreference(obj);
		return 0;
		unlock:
		mutex_unlock(&dev->struct_mutex);
		return ret;
		}

		/**

Admin message