public inbox for virtualization@lists.linux-foundation.org
 help / color / mirror / Atom feed
From: Thomas Zimmermann <tzimmermann@suse.de>
To: simona@ffwll.ch, airlied@gmail.com, christian.koenig@amd.com,
	torvalds@linux-foundation.org, maarten.lankhorst@linux.intel.com,
	mripard@kernel.org, l.stach@pengutronix.de,
	linux+etnaviv@armlinux.org.uk, kraxel@redhat.com,
	christian.gmeiner@gmail.com, dmitry.osipenko@collabora.com,
	gurchetansingh@chromium.org, olvaffe@gmail.com,
	zack.rusin@broadcom.com
Cc: bcm-kernel-feedback-list@broadcom.com,
	dri-devel@lists.freedesktop.org, etnaviv@lists.freedesktop.org,
	virtualization@lists.linux.dev, intel-gfx@lists.freedesktop.org,
	Thomas Zimmermann <tzimmermann@suse.de>
Subject: [PATCH 3/9] Revert "drm/virtio: Use dma_buf from GEM object instance"
Date: Fri, 11 Jul 2025 11:35:18 +0200	[thread overview]
Message-ID: <20250711093744.120962-4-tzimmermann@suse.de> (raw)
In-Reply-To: <20250711093744.120962-1-tzimmermann@suse.de>

This reverts commit 415cb45895f43015515473fbc40563ca5eec9a7c.

Reverting because the fix-up commits are suspected to cause regressions.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 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;
 
 		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);
 	}
 
-- 
2.50.0


  parent reply	other threads:[~2025-07-11  9:41 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-11  9:35 [PATCH 0/9] drm: Revert general use of struct drm_gem_object.dma_buf Thomas Zimmermann
2025-07-11  9:35 ` [PATCH 1/9] Revert "drm/framebuffer: Acquire internal references on GEM handles" Thomas Zimmermann
2025-07-11  9:35 ` [PATCH 2/9] Revert "drm/gem: Acquire references on GEM handles for framebuffers" Thomas Zimmermann
2025-07-11 10:08   ` Simona Vetter
2025-07-11 11:00     ` Christian König
2025-07-11 11:22       ` Simona Vetter
2025-07-11  9:35 ` Thomas Zimmermann [this message]
2025-07-11 11:29   ` [PATCH 3/9] Revert "drm/virtio: Use dma_buf from GEM object instance" Dmitry Osipenko
2025-07-11 11:31     ` Simona Vetter
2025-07-11 11:49       ` Dmitry Osipenko
2025-07-11 12:01         ` Thomas Zimmermann
2025-07-11 12:15           ` Dmitry Osipenko
2025-07-11  9:35 ` [PATCH 4/9] Revert "drm/vmwgfx: " Thomas Zimmermann
2025-07-11  9:35 ` [PATCH 5/9] Revert "drm/etnaviv: " Thomas Zimmermann
2025-07-11  9:35 ` [PATCH 6/9] Revert "drm/prime: " Thomas Zimmermann
2025-07-11  9:35 ` [PATCH 7/9] Revert "drm/gem-framebuffer: " Thomas Zimmermann
2025-07-11  9:35 ` [PATCH 8/9] Revert "drm/gem-shmem: " Thomas Zimmermann
2025-07-11  9:35 ` [PATCH 9/9] Revert "drm/gem-dma: " Thomas Zimmermann
2025-07-11 10:32 ` [PATCH 0/9] drm: Revert general use of struct drm_gem_object.dma_buf Christian König
2025-07-11 11:26   ` Simona Vetter
2025-07-11 15:48 ` Linus Torvalds
2025-07-11 16:41   ` Thomas Zimmermann
2025-07-11 17:35   ` Linus Torvalds
2025-07-11 18:37     ` Linus Torvalds
2025-07-11 21:52       ` Simona Vetter
2025-07-14 12:39 ` Simona Vetter
2025-07-15  7:41   ` Thomas Zimmermann
2025-07-15 13:07     ` Simona Vetter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250711093744.120962-4-tzimmermann@suse.de \
    --to=tzimmermann@suse.de \
    --cc=airlied@gmail.com \
    --cc=bcm-kernel-feedback-list@broadcom.com \
    --cc=christian.gmeiner@gmail.com \
    --cc=christian.koenig@amd.com \
    --cc=dmitry.osipenko@collabora.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=etnaviv@lists.freedesktop.org \
    --cc=gurchetansingh@chromium.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=kraxel@redhat.com \
    --cc=l.stach@pengutronix.de \
    --cc=linux+etnaviv@armlinux.org.uk \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=mripard@kernel.org \
    --cc=olvaffe@gmail.com \
    --cc=simona@ffwll.ch \
    --cc=torvalds@linux-foundation.org \
    --cc=virtualization@lists.linux.dev \
    --cc=zack.rusin@broadcom.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox