On 7/11/25 12:35, Thomas Zimmermann wrote:
> This reverts commit 415cb45895f43015515473fbc40563ca5eec9a7c.
>
> Reverting because the fix-up commits are suspected to cause regressions.
>
> Signed-off-by: Thomas Zimmermann <tzimmerm...@suse.de>
Are the fixes and stable tags missing in the patches? AFAICT, the intent
is to fix stable 6.15 kernel regression.
> ---
> drivers/gpu/drm/virtio/virtgpu_prime.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c
> b/drivers/gpu/drm/virtio/virtgpu_prime.c
> index 722cde5e2d86..97aaee26cb02 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_prime.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_prime.c
> @@ -204,15 +204,16 @@ static void virtgpu_dma_buf_free_obj(struct
> drm_gem_object *obj)
> {
> struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(obj);
> struct virtio_gpu_device *vgdev = obj->dev->dev_private;
> + struct dma_buf_attachment *attach = obj->import_attach;
>
> if (drm_gem_is_imported(obj)) {
> - struct dma_buf *dmabuf = bo->dma_buf;
> + struct dma_buf *dmabuf = attach->dmabuf;
Nit: I'd write this as `dmabuf = obj->import_attach->dmabuf` for more
consistency with drm_gem_is_imported()
> dma_resv_lock(dmabuf->resv, NULL);
> virtgpu_dma_buf_unmap(bo);
> dma_resv_unlock(dmabuf->resv);
>
> - dma_buf_detach(dmabuf, obj->import_attach);
> + dma_buf_detach(dmabuf, attach);
> dma_buf_put(dmabuf);
> }
>
Acked-by: Dmitry Osipenko <dmitry.osipe...@collabora.com>
--
Best regards,
Dmitry
