Merge tag 'topic/drm-fixes-2015-07-16' of git://anongit.freedesktop.org/drm-intel into drm-fixes (37553983) · Commits · 戴 / test

Documentation/DocBook/drm.tmpl

+1 −1

Original line number	Diff line number	Diff line
		@@ -3383,7 +3383,7 @@ void intel_crt_init(struct drm_device *dev)
		<td valign="top" >TBD</td>
		</tr>
		<tr>
		<td rowspan="2" valign="top" >omap</td>
		<td valign="top" >omap</td>
		<td valign="top" >Generic</td>
		<td valign="top" >“zorder”</td>
		<td valign="top" >RANGE</td>

drivers/gpu/drm/drm_crtc.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -2706,8 +2706,11 @@ int drm_mode_setcrtc(struct drm_device dev, void data,
		if (!drm_core_check_feature(dev, DRIVER_MODESET))
		return -EINVAL;

		/* For some reason crtc x/y offsets are signed internally. */
		if (crtc_req->x > INT_MAX \|\| crtc_req->y > INT_MAX)
		/*
		* Universal plane src offsets are only 16.16, prevent havoc for
		* drivers using universal plane code internally.
		*/
		if (crtc_req->x & 0xffff0000 \|\| crtc_req->y & 0xffff0000)
		return -ERANGE;

		drm_modeset_lock_all(dev);

drivers/gpu/drm/drm_ioc32.c

+60 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,8 @@

		#define DRM_IOCTL_WAIT_VBLANK32 DRM_IOWR(0x3a, drm_wait_vblank32_t)

		#define DRM_IOCTL_MODE_ADDFB232 DRM_IOWR(0xb8, drm_mode_fb_cmd232_t)

		typedef struct drm_version_32 {
		int version_major; /*< Major version /
		int version_minor; /*< Minor version /
		@@ -1016,6 +1018,63 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
		return 0;
		}

		typedef struct drm_mode_fb_cmd232 {
		u32 fb_id;
		u32 width;
		u32 height;
		u32 pixel_format;
		u32 flags;
		u32 handles[4];
		u32 pitches[4];
		u32 offsets[4];
		u64 modifier[4];
		} __attribute__((packed)) drm_mode_fb_cmd232_t;

		static int compat_drm_mode_addfb2(struct file *file, unsigned int cmd,
		unsigned long arg)
		{
		struct drm_mode_fb_cmd232 __user argp = (void __user )arg;
		struct drm_mode_fb_cmd232 req32;
		struct drm_mode_fb_cmd2 __user *req64;
		int i;
		int err;

		if (copy_from_user(&req32, argp, sizeof(req32)))
		return -EFAULT;

		req64 = compat_alloc_user_space(sizeof(*req64));

		if (!access_ok(VERIFY_WRITE, req64, sizeof(*req64))
		\|\| __put_user(req32.width, &req64->width)
		\|\| __put_user(req32.height, &req64->height)
		\|\| __put_user(req32.pixel_format, &req64->pixel_format)
		\|\| __put_user(req32.flags, &req64->flags))
		return -EFAULT;

		for (i = 0; i < 4; i++) {
		if (__put_user(req32.handles[i], &req64->handles[i]))
		return -EFAULT;
		if (__put_user(req32.pitches[i], &req64->pitches[i]))
		return -EFAULT;
		if (__put_user(req32.offsets[i], &req64->offsets[i]))
		return -EFAULT;
		if (__put_user(req32.modifier[i], &req64->modifier[i]))
		return -EFAULT;
		}

		err = drm_ioctl(file, DRM_IOCTL_MODE_ADDFB2, (unsigned long)req64);
		if (err)
		return err;

		if (__get_user(req32.fb_id, &req64->fb_id))
		return -EFAULT;

		if (copy_to_user(argp, &req32, sizeof(req32)))
		return -EFAULT;

		return 0;
		}

		static drm_ioctl_compat_t *drm_compat_ioctls[] = {
		[DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
		[DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
		@@ -1048,6 +1107,7 @@ static drm_ioctl_compat_t *drm_compat_ioctls[] = {
		[DRM_IOCTL_NR(DRM_IOCTL_UPDATE_DRAW32)] = compat_drm_update_draw,
		#endif
		[DRM_IOCTL_NR(DRM_IOCTL_WAIT_VBLANK32)] = compat_drm_wait_vblank,
		[DRM_IOCTL_NR(DRM_IOCTL_MODE_ADDFB232)] = compat_drm_mode_addfb2,
		};

		/**

drivers/gpu/drm/rockchip/rockchip_drm_gem.c

+34 −33

Original line number	Diff line number	Diff line
		@@ -54,55 +54,56 @@ static void rockchip_gem_free_buf(struct rockchip_gem_object *rk_obj)
		&rk_obj->dma_attrs);
		}

		int rockchip_gem_mmap_buf(struct drm_gem_object *obj,
		static int rockchip_drm_gem_object_mmap(struct drm_gem_object *obj,
		struct vm_area_struct *vma)

		{
		int ret;
		struct rockchip_gem_object *rk_obj = to_rockchip_obj(obj);
		struct drm_device *drm = obj->dev;
		unsigned long vm_size;

		vma->vm_flags \|= VM_IO \| VM_DONTEXPAND \| VM_DONTDUMP;
		vm_size = vma->vm_end - vma->vm_start;

		if (vm_size > obj->size)
		return -EINVAL;
		/*
		* dma_alloc_attrs() allocated a struct page table for rk_obj, so clear
		* VM_PFNMAP flag that was set by drm_gem_mmap_obj()/drm_gem_mmap().
		*/
		vma->vm_flags &= ~VM_PFNMAP;

		return dma_mmap_attrs(drm->dev, vma, rk_obj->kvaddr, rk_obj->dma_addr,
		ret = dma_mmap_attrs(drm->dev, vma, rk_obj->kvaddr, rk_obj->dma_addr,
		obj->size, &rk_obj->dma_attrs);
		if (ret)
		drm_gem_vm_close(vma);

		return ret;
		}

		/* drm driver mmap file operations */
		int rockchip_gem_mmap(struct file filp, struct vm_area_struct vma)
		int rockchip_gem_mmap_buf(struct drm_gem_object *obj,
		struct vm_area_struct *vma)
		{
		struct drm_file *priv = filp->private_data;
		struct drm_device *dev = priv->minor->dev;
		struct drm_gem_object *obj;
		struct drm_vma_offset_node *node;
		struct drm_device *drm = obj->dev;
		int ret;

		if (drm_device_is_unplugged(dev))
		return -ENODEV;

		mutex_lock(&dev->struct_mutex);
		mutex_lock(&drm->struct_mutex);
		ret = drm_gem_mmap_obj(obj, obj->size, vma);
		mutex_unlock(&drm->struct_mutex);
		if (ret)
		return ret;

		node = drm_vma_offset_exact_lookup(dev->vma_offset_manager,
		vma->vm_pgoff,
		vma_pages(vma));
		if (!node) {
		mutex_unlock(&dev->struct_mutex);
		DRM_ERROR("failed to find vma node.\n");
		return -EINVAL;
		} else if (!drm_vma_node_is_allowed(node, filp)) {
		mutex_unlock(&dev->struct_mutex);
		return -EACCES;
		return rockchip_drm_gem_object_mmap(obj, vma);
		}

		obj = container_of(node, struct drm_gem_object, vma_node);
		ret = rockchip_gem_mmap_buf(obj, vma);

		mutex_unlock(&dev->struct_mutex);
		/* drm driver mmap file operations */
		int rockchip_gem_mmap(struct file filp, struct vm_area_struct vma)
		{
		struct drm_gem_object *obj;
		int ret;

		ret = drm_gem_mmap(filp, vma);
		if (ret)
		return ret;

		obj = vma->vm_private_data;

		return rockchip_drm_gem_object_mmap(obj, vma);
		}

		struct rockchip_gem_object *

Admin message