Merge tag 'topic/struct_mutex-2016-04-21' of git://anongit.freedesktop.org/drm-intel into drm-next (f230ffa1) · Commits · 戴 / test

drivers/gpu/drm/drm_gem.c

+17 −0

Original line number	Diff line number	Diff line
		@@ -422,6 +422,10 @@ EXPORT_SYMBOL(drm_gem_handle_create);
		* @obj: obj in question
		*
		* This routine frees fake offsets allocated by drm_gem_create_mmap_offset().
		*
		* Note that drm_gem_object_release() already calls this function, so drivers
		* don't have to take care of releasing the mmap offset themselves when freeing
		* the GEM object.
		*/
		void
		drm_gem_free_mmap_offset(struct drm_gem_object *obj)
		@@ -445,6 +449,9 @@ EXPORT_SYMBOL(drm_gem_free_mmap_offset);
		* This routine allocates and attaches a fake offset for @obj, in cases where
		* the virtual size differs from the physical size (ie. obj->size). Otherwise
		* just use drm_gem_create_mmap_offset().
		*
		* This function is idempotent and handles an already allocated mmap offset
		* transparently. Drivers do not need to check for this case.
		*/
		int
		drm_gem_create_mmap_offset_size(struct drm_gem_object *obj, size_t size)
		@@ -466,6 +473,9 @@ EXPORT_SYMBOL(drm_gem_create_mmap_offset_size);
		* structures.
		*
		* This routine allocates and attaches a fake offset for @obj.
		*
		* Drivers can call drm_gem_free_mmap_offset() before freeing @obj to release
		* the fake offset again.
		*/
		int drm_gem_create_mmap_offset(struct drm_gem_object *obj)
		{
		@@ -759,6 +769,13 @@ drm_gem_release(struct drm_device dev, struct drm_file file_private)
		idr_destroy(&file_private->object_idr);
		}

		/**
		* drm_gem_object_release - release GEM buffer object resources
		* @obj: GEM buffer object
		*
		* This releases any structures and resources used by @obj and is the invers of
		* drm_gem_object_init().
		*/
		void
		drm_gem_object_release(struct drm_gem_object *obj)
		{

drivers/gpu/drm/exynos/exynos_drm_fbdev.c

+8 −14

Original line number	Diff line number	Diff line
		@@ -138,8 +138,6 @@ static int exynos_drm_fbdev_create(struct drm_fb_helper *helper,
		mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp,
		sizes->surface_depth);

		mutex_lock(&dev->struct_mutex);

		size = mode_cmd.pitches[0] * mode_cmd.height;

		exynos_gem = exynos_drm_gem_create(dev, EXYNOS_BO_CONTIG, size);
		@@ -154,10 +152,8 @@ static int exynos_drm_fbdev_create(struct drm_fb_helper *helper,
		size);
		}

		if (IS_ERR(exynos_gem)) {
		ret = PTR_ERR(exynos_gem);
		goto out;
		}
		if (IS_ERR(exynos_gem))
		return PTR_ERR(exynos_gem);

		exynos_fbdev->exynos_gem = exynos_gem;

		@@ -173,7 +169,6 @@ static int exynos_drm_fbdev_create(struct drm_fb_helper *helper,
		if (ret < 0)
		goto err_destroy_framebuffer;

		mutex_unlock(&dev->struct_mutex);
		return ret;

		err_destroy_framebuffer:
		@@ -186,8 +181,7 @@ err_destroy_gem:
		* drm_mode_config_cleanup() when drm_load() had been called prior
		* to any specific driver such as fimd or hdmi driver.
		*/
		out:
		mutex_unlock(&dev->struct_mutex);

		return ret;
		}

drivers/gpu/drm/exynos/exynos_drm_gem.c

+3 −16

Original line number	Diff line number	Diff line
		@@ -362,12 +362,9 @@ int exynos_drm_gem_get_ioctl(struct drm_device dev, void data,
		struct drm_exynos_gem_info *args = data;
		struct drm_gem_object *obj;

		mutex_lock(&dev->struct_mutex);

		obj = drm_gem_object_lookup(dev, file_priv, args->handle);
		if (!obj) {
		DRM_ERROR("failed to lookup gem object.\n");
		mutex_unlock(&dev->struct_mutex);
		return -EINVAL;
		}

		@@ -376,8 +373,7 @@ int exynos_drm_gem_get_ioctl(struct drm_device dev, void data,
		args->flags = exynos_gem->flags;
		args->size = exynos_gem->size;

		drm_gem_object_unreference(obj);
		mutex_unlock(&dev->struct_mutex);
		drm_gem_object_unreference_unlocked(obj);

		return 0;
		}
		@@ -388,16 +384,12 @@ int exynos_gem_map_sgt_with_dma(struct drm_device *drm_dev,
		{
		int nents;

		mutex_lock(&drm_dev->struct_mutex);

		nents = dma_map_sg(to_dma_dev(drm_dev), sgt->sgl, sgt->nents, dir);
		if (!nents) {
		DRM_ERROR("failed to map sgl with dma.\n");
		mutex_unlock(&drm_dev->struct_mutex);
		return nents;
		}

		mutex_unlock(&drm_dev->struct_mutex);
		return 0;
		}

		@@ -458,8 +450,6 @@ int exynos_drm_gem_dumb_map_offset(struct drm_file *file_priv,
		struct drm_gem_object *obj;
		int ret = 0;

		mutex_lock(&dev->struct_mutex);

		/*
		* get offset of memory allocated for drm framebuffer.
		* - this callback would be called by user application
		@@ -469,16 +459,13 @@ int exynos_drm_gem_dumb_map_offset(struct drm_file *file_priv,
		obj = drm_gem_object_lookup(dev, file_priv, handle);
		if (!obj) {
		DRM_ERROR("failed to lookup gem object.\n");
		ret = -EINVAL;
		goto unlock;
		return -EINVAL;
		}

		*offset = drm_vma_node_offset_addr(&obj->vma_node);
		DRM_DEBUG_KMS("offset = 0x%lx\n", (unsigned long)*offset);

		drm_gem_object_unreference(obj);
		unlock:
		mutex_unlock(&dev->struct_mutex);
		drm_gem_object_unreference_unlocked(obj);
		return ret;
		}

drivers/gpu/drm/i915/i915_gem.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -2031,9 +2031,6 @@ static int i915_gem_object_create_mmap_offset(struct drm_i915_gem_object *obj)
		struct drm_i915_private *dev_priv = obj->base.dev->dev_private;
		int ret;

		if (drm_vma_node_has_offset(&obj->base.vma_node))
		return 0;

		dev_priv->mm.shrinker_no_lock_stealing = true;

		ret = drm_gem_create_mmap_offset(&obj->base);

drivers/gpu/drm/nouveau/nouveau_display.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -296,7 +296,7 @@ nouveau_user_framebuffer_create(struct drm_device *dev,
		err:
		kfree(nouveau_fb);
		err_unref:
		drm_gem_object_unreference(gem);
		drm_gem_object_unreference_unlocked(gem);
		return ERR_PTR(ret);
		}

Admin message