diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-08-19 17:39:33 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-08-20 06:01:34 +1000 |
| commit | e213bd1e72f06529178d41af93fde0523b2b6f46 (patch) | |
| tree | 7aaa6b1e0c5621beffc049c74478e88fb298e4d5 | |
| parent | 7c60610d476766e128cc4284bb6349732cbd6606 (diff) | |
| parent | fa0b1ef5f7a694f48e00804a391245f3471aa155 (diff) | |
| download | linux-e213bd1e72f06529178d41af93fde0523b2b6f46.tar.bz2 | |
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
| -rw-r--r-- | drivers/gpu/drm/drm_ioc32.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_device.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c index d29907955ff7..5d82891c3222 100644 --- a/drivers/gpu/drm/drm_ioc32.c +++ b/drivers/gpu/drm/drm_ioc32.c @@ -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) diff --git a/drivers/gpu/drm/ttm/ttm_device.c b/drivers/gpu/drm/ttm/ttm_device.c index 74e3b460132b..2df59b3c2ea1 100644 --- a/drivers/gpu/drm/ttm/ttm_device.c +++ b/drivers/gpu/drm/ttm/ttm_device.c @@ -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 |