Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28b90a9e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~dvdhrm/linux into drm-next 

This branch includes 6 minor fixes mainly for udl. Everything non-trivial was
reviewed by Daniel and the patches have been on the list for quite some time.

* 'drm-fixes' of git://people.freedesktop.org/~dvdhrm/linux:
  drm/gem: dont init "ret" in drm_gem_mmap()
  drm/crtc: add sanity checks to create_dumb()
  drm/gem: free vma-node during object-cleanup
  drm/gem: fix indentation
  drm/udl: fix Bpp calculation in dumb_create()
  drm/udl: fix error-path when damage-req fails
parents 786a7828 a8469aa8

drivers/gpu/drm/drm_crtc.c

+17 −0
Original line number Diff line number Diff line
@@ -3784,9 +3784,26 @@ int drm_mode_create_dumb_ioctl(struct drm_device *dev, 
			       void *data, struct drm_file *file_priv)

{

	struct drm_mode_create_dumb *args = data;

	u32 cpp, stride, size;



	if (!dev->driver->dumb_create)

		return -ENOSYS;

	if (!args->width || !args->height || !args->bpp)

		return -EINVAL;



	/* overflow checks for 32bit size calculations */

	cpp = DIV_ROUND_UP(args->bpp, 8);

	if (cpp > 0xffffffffU / args->width)

		return -EINVAL;

	stride = cpp * args->width;

	if (args->height > 0xffffffffU / stride)

		return -EINVAL;



	/* test for wrap-around */

	size = args->height * stride;

	if (PAGE_ALIGN(size) == 0)

		return -EINVAL;



	return dev->driver->dumb_create(file_priv, dev, args);

}

drivers/gpu/drm/drm_gem.c

+5 −3
Original line number Diff line number Diff line
@@ -693,6 +693,8 @@ drm_gem_object_release(struct drm_gem_object *obj) 


	if (obj->filp)

		fput(obj->filp);



	drm_gem_free_mmap_offset(obj);

}

EXPORT_SYMBOL(drm_gem_object_release);
@@ -818,7 +820,7 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) 
	struct drm_device *dev = priv->minor->dev;

	struct drm_gem_object *obj;

	struct drm_vma_offset_node *node;

	int ret = 0;

	int ret;



	if (drm_device_is_unplugged(dev))

		return -ENODEV;

drivers/gpu/drm/udl/udl_fb.c

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ static int udl_user_framebuffer_dirty(struct drm_framebuffer *fb, 
				  clips[i].x2 - clips[i].x1,

				  clips[i].y2 - clips[i].y1);

		if (ret)

			goto unlock;

			break;

	}



	if (ufb->obj->base.import_attach) {

drivers/gpu/drm/udl/udl_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ int udl_dumb_create(struct drm_file *file, 
		    struct drm_device *dev,

		    struct drm_mode_create_dumb *args)

{

	args->pitch = args->width * ((args->bpp + 1) / 8);

	args->pitch = args->width * DIV_ROUND_UP(args->bpp, 8);

	args->size = args->pitch * args->height;

	return udl_gem_create(file, dev,

			      args->size, &args->handle);