mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-23 02:51:47 +00:00
Code Issues Releases Wiki Activity

Short summary of fixes pull:

Browse source 
* UAPI: Return results for failed drm_wait_vblank_ioctl()
  * ttm: Fix debugfs initialization
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEchf7rIzpz2NEoWjlaA3BHVMLeiMFAmEdW1gACgkQaA3BHVML
 eiOQzQf+I3z4eJyRjwXN4GmPAYEeHcnmYPpV+dFQMDRbO+k9gmlzruH55Q1iwpRS
 eNi8VKZeDtLVERBMaJ8JejyrpwKMv5O7XWL3eyvpOVymiK/ESx44xuyT+Ev1laey
 +U1wpQUWR4QJOKGm5/05APVgvrTR3kNPlAUudY50GlUSpYyjwpFdpNHqt2mEcaNb
 39Y6whA2TiGFi0ZF3BFsqg8OtMkxXr1ilUMfXcXEO3VwNUWusEbqoQFa65nRYig4
 uLmh9Hmx79y7V+S0G6fZ5LvUWRYR5n29Kp1bQl74Ded2/nFnf1zQZb3JvjZf5YXk
 l1F/dgCjCfLbLmWnuArFOhx2gpmYYg==
 =QQAD
 -----END PGP SIGNATURE-----

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: Dave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YR1c7cG1IaL+g8EN@linux-uq9g.fritz.box
This commit is contained in:
Dave Airlie 2021-08-19 17:39:33 +10:00
commit e213bd1e72
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/drm_ioc32.c
View file

@ -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)

2
drivers/gpu/drm/ttm/ttm_device.c
View file

@ -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