Message ID | 20240714205009.3408298-1-dmitry.osipenko@collabora.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [v1] drm/virtio: Fix type of dma-fence context variable | expand |
On Sun, Jul 14, 2024 at 1:50 PM Dmitry Osipenko <dmitry.osipenko@collabora.com> wrote: > > Type of DMA fence context is u64. Fence-waiting code uses u32 for the > context variable, fix it. > > Fixes: e4812ab8e6b1 ("drm/virtio: Refactor and optimize job submission code path") > Cc: <stable@vger.kernel.org> # v6.4+ > Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> Reviewed-by: Rob Clark <robdclark@gmail.com> > --- > drivers/gpu/drm/virtio/virtgpu_submit.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/virtio/virtgpu_submit.c b/drivers/gpu/drm/virtio/virtgpu_submit.c > index 1c7c7f61a222..7d34cf83f5f2 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_submit.c > +++ b/drivers/gpu/drm/virtio/virtgpu_submit.c > @@ -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; > -- > 2.45.2 >
On 7/14/24 23:50, Dmitry Osipenko wrote: > Type of DMA fence context is u64. Fence-waiting code uses u32 for the > context variable, fix it. > > Fixes: e4812ab8e6b1 ("drm/virtio: Refactor and optimize job submission code path") > Cc: <stable@vger.kernel.org> # v6.4+ > Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> > --- > drivers/gpu/drm/virtio/virtgpu_submit.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/virtio/virtgpu_submit.c b/drivers/gpu/drm/virtio/virtgpu_submit.c > index 1c7c7f61a222..7d34cf83f5f2 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_submit.c > +++ b/drivers/gpu/drm/virtio/virtgpu_submit.c > @@ -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; Applied to misc-fixes
diff --git a/drivers/gpu/drm/virtio/virtgpu_submit.c b/drivers/gpu/drm/virtio/virtgpu_submit.c index 1c7c7f61a222..7d34cf83f5f2 100644 --- a/drivers/gpu/drm/virtio/virtgpu_submit.c +++ b/drivers/gpu/drm/virtio/virtgpu_submit.c @@ -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;
Type of DMA fence context is u64. Fence-waiting code uses u32 for the context variable, fix it. Fixes: e4812ab8e6b1 ("drm/virtio: Refactor and optimize job submission code path") Cc: <stable@vger.kernel.org> # v6.4+ Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> --- drivers/gpu/drm/virtio/virtgpu_submit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)