Commit e213bd1e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2021-08-18' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



Short summary of fixes pull:

 * UAPI: Return results for failed drm_wait_vblank_ioctl()
 * ttm: Fix debugfs initialization

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YR1c7cG1IaL+g8EN@linux-uq9g.fritz.box
parents 7c60610d fa0b1ef5

drivers/gpu/drm/drm_ioc32.c

+1 −3
Original line number Diff line number Diff line
@@ -855,8 +855,6 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd, 
	req.request.sequence = req32.request.sequence;

	req.request.signal = req32.request.signal;

	err = drm_ioctl_kernel(file, drm_wait_vblank_ioctl, &req, DRM_UNLOCKED);

	if (err)

		return err;



	req32.reply.type = req.reply.type;

	req32.reply.sequence = req.reply.sequence;
@@ -865,7 +863,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd, 
	if (copy_to_user(argp, &req32, sizeof(req32)))

		return -EFAULT;



	return 0;

	return err;

}



#if defined(CONFIG_X86)

drivers/gpu/drm/ttm/ttm_device.c

+0 −2
Original line number Diff line number Diff line
@@ -78,9 +78,7 @@ static int ttm_global_init(void) 


	ttm_debugfs_root = debugfs_create_dir("ttm", NULL);

	if (IS_ERR(ttm_debugfs_root)) {

		ret = PTR_ERR(ttm_debugfs_root);

		ttm_debugfs_root = NULL;

		goto out;

	}



	/* Limit the number of pages in the pool to about 50% of the total