Commit f3379b24 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by ZhangPeng
Browse files

drm/virtio: Fix type of dma-fence context variable 

stable inclusion
from stable-v6.6.45
commit a62c98142ca1f03ce76351a3e137a6b6facfd367
bugzilla: https://gitee.com/openeuler/kernel/issues/IAJEIR

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a62c98142ca1f03ce76351a3e137a6b6facfd367



--------------------------------

commit 445d336cd15860f1efb441e6d694f829fbf679eb upstream.

Type of DMA fence context is u64. Fence-waiting code uses u32 for the
context variable, fix it.

Fixes: e4812ab8 ("drm/virtio: Refactor and optimize job submission code path")
Cc: <stable@vger.kernel.org> # v6.4+
Signed-off-by: default avatarDmitry Osipenko <dmitry.osipenko@collabora.com>
Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240714205009.3408298-1-dmitry.osipenko@collabora.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent d86cf69e

drivers/gpu/drm/virtio/virtgpu_submit.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ struct virtio_gpu_submit { 
static int virtio_gpu_do_fence_wait(struct virtio_gpu_submit *submit,

				    struct dma_fence *in_fence)

{

	u32 context = submit->fence_ctx + submit->ring_idx;

	u64 context = submit->fence_ctx + submit->ring_idx;



	if (dma_fence_match_context(in_fence, context))

		return 0;