* [PATCH -next] drm/syncobj: add missing error return code in drm_syncobj_transfer_to_timeline()
@ 2022-06-13 6:34 Yang Yingliang
2022-06-13 6:51 ` Christian König
0 siblings, 1 reply; 2+ messages in thread
From: Yang Yingliang @ 2022-06-13 6:34 UTC (permalink / raw)
To: linux-kernel, dri-devel; +Cc: christian.koenig, daniel.vetter
If dma_fence_unwrap_merge() fails, it should return error code
in drm_syncobj_transfer_to_timeline()
Fixes: ec8d985ff26f ("drm: use dma_fence_unwrap_merge() in drm_syncobj")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
drivers/gpu/drm/drm_syncobj.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c
index bbad9e4696e7..0c2be8360525 100644
--- a/drivers/gpu/drm/drm_syncobj.c
+++ b/drivers/gpu/drm/drm_syncobj.c
@@ -874,8 +874,10 @@ static int drm_syncobj_transfer_to_timeline(struct drm_file *file_private,
fence = dma_fence_unwrap_merge(tmp);
dma_fence_put(tmp);
- if (!fence)
+ if (!fence) {
+ ret = -ENOMEM;
goto err_put_timeline;
+ }
chain = dma_fence_chain_alloc();
if (!chain) {
--
2.25.1
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH -next] drm/syncobj: add missing error return code in drm_syncobj_transfer_to_timeline()
2022-06-13 6:34 [PATCH -next] drm/syncobj: add missing error return code in drm_syncobj_transfer_to_timeline() Yang Yingliang
@ 2022-06-13 6:51 ` Christian König
0 siblings, 0 replies; 2+ messages in thread
From: Christian König @ 2022-06-13 6:51 UTC (permalink / raw)
To: Yang Yingliang, linux-kernel, dri-devel; +Cc: daniel.vetter
Am 13.06.22 um 08:34 schrieb Yang Yingliang:
> If dma_fence_unwrap_merge() fails, it should return error code
> in drm_syncobj_transfer_to_timeline()
>
> Fixes: ec8d985ff26f ("drm: use dma_fence_unwrap_merge() in drm_syncobj")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Going to push that in a minute.
Thanks,
Christian.
> ---
> drivers/gpu/drm/drm_syncobj.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c
> index bbad9e4696e7..0c2be8360525 100644
> --- a/drivers/gpu/drm/drm_syncobj.c
> +++ b/drivers/gpu/drm/drm_syncobj.c
> @@ -874,8 +874,10 @@ static int drm_syncobj_transfer_to_timeline(struct drm_file *file_private,
>
> fence = dma_fence_unwrap_merge(tmp);
> dma_fence_put(tmp);
> - if (!fence)
> + if (!fence) {
> + ret = -ENOMEM;
> goto err_put_timeline;
> + }
>
> chain = dma_fence_chain_alloc();
> if (!chain) {
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-06-13 6:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-13 6:34 [PATCH -next] drm/syncobj: add missing error return code in drm_syncobj_transfer_to_timeline() Yang Yingliang
2022-06-13 6:51 ` Christian König
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®