From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6265EC83F1A for ; Fri, 11 Jul 2025 11:32:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E930D10E9BD; Fri, 11 Jul 2025 11:32:02 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; secure) header.d=ffwll.ch header.i=@ffwll.ch header.b="Fd0iBxpJ"; dkim-atps=neutral Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0F9FB10EA21 for ; Fri, 11 Jul 2025 11:32:02 +0000 (UTC) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-45555e3317aso3384125e9.3 for ; Fri, 11 Jul 2025 04:32:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; t=1752233520; x=1752838320; darn=lists.freedesktop.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=/dNrxn0YIHnXxTbrqnAMkGtS4RTsd+jjEf/10Hz2GZA=; b=Fd0iBxpJC1mJa3LQjy+zvhVA6iWYf0SoPB1G2u1UsUPA3ZXhNSZBpcDeuY4JeZ9Jln MFOBfxVe9JzIsMxqPQC7YepmkFW7csEeXdgKS/tL5goQLyDBFc+v7BtH/JQxz7ZRdf3s n8cKcoGbEVoUpGrTR06qph2VPL9ClQo6PYUg4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752233520; x=1752838320; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=/dNrxn0YIHnXxTbrqnAMkGtS4RTsd+jjEf/10Hz2GZA=; b=uhJ2sOuxkqe8DohsvN2KqgRMvYNkI06s9pG3Rbn8yh/qDubOJXmxbMrVA8SFiQbZB1 NVlCUDf/DH87c3mmd7j1/3BskxU1C9K4ToOsH7ub5pvic19UNhiQoWD8bhUqKv7YoN3d NCXqb3yFmgL6NuczAvrgFfWqNIv3DZHqb+mr70euddhdaFt7RLCF9UbTpWkyxPQ73B/k Iusb21suM4ZWvzdidvtHsv9ewPuJzOPXwL991RnY1KcVGvi8kYdv/eSFPqpFAsdniRnV 32C7X6X6GV9/G6ehtUYep9U7q2qs+nvB9dIVjsEBM16Tv5KOf2+XNyr2i6f5HwYsCoDS 0ohg== X-Forwarded-Encrypted: i=1; AJvYcCVo6Wm5yjkp2ArMkBNqXMaNU7pw19R9IST3DchjbBs6UQ0SaL7yto2Tfz9O/MgRLKdLC7Hpet4Kj4c=@lists.freedesktop.org X-Gm-Message-State: AOJu0YwSO3I5/OTlHLl15rfoY0hJC26z4MgugS+SwjQZwPJF+6a5KefK KcHJTCY1E4rDWswMSgFZ80a802Tbt0ctiDLFeGwjHcslfTSM9CrmiFh/aTQHdXzkQrTTxmygoYM wRKmMvCo= X-Gm-Gg: ASbGnctUoexPGMRJGu0bs0sS7Zr5LZhOLslum1Rmx16xGhXWPsOGbegJ1FL6VtozBEn 6SXp9i54j9wLBZ9LnpP1arNmDRM9cyDwQ9SDONHvrEHQ3t3bo58/OPPp0Gk+SpOO8a2xfSK+blD BRv+fagzsUxFi0L4xEssUBeyeyTTbzqc/YqI0B/H586MgNdv37yM/k2zya65KI7pe2UA4W5N5ff 6+y1K0PI8BCldmUuxY0HAm/rwZ2WVPlV/VUKKVMmHMMVloxnasOfBW5ZQ+G1APMxqn4qBD//hs2 Kw3m98dvhzv96c0hPSOAM/5h2d8xLPC89oYTqAL4tChmYpOThMvxTuNBFkvp9I3Ndhy9zZ893iW O9leTA1Iy4qh4bYvbIUhqz96npQIplw3+FA== X-Google-Smtp-Source: AGHT+IExin2KICT09xxIWEiy7oXdoYxqzYy1rlv7xdICXXPI31huPS+YOlQR6sPcBxEiaeI5BkQrcw== X-Received: by 2002:a05:600c:1551:b0:448:e8c0:c778 with SMTP id 5b1f17b1804b1-454ec27d5d5mr21986325e9.22.1752233520484; Fri, 11 Jul 2025 04:32:00 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:5485:d4b2:c087:b497]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-454d5103c2asm81356815e9.33.2025.07.11.04.31.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jul 2025 04:32:00 -0700 (PDT) Date: Fri, 11 Jul 2025 13:31:58 +0200 From: Simona Vetter To: Dmitry Osipenko Cc: Thomas Zimmermann , 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, gurchetansingh@chromium.org, olvaffe@gmail.com, zack.rusin@broadcom.com, bcm-kernel-feedback-list@broadcom.com, dri-devel@lists.freedesktop.org, etnaviv@lists.freedesktop.org, virtualization@lists.linux.dev, intel-gfx@lists.freedesktop.org Subject: Re: [PATCH 3/9] Revert "drm/virtio: Use dma_buf from GEM object instance" Message-ID: References: <20250711093744.120962-1-tzimmermann@suse.de> <20250711093744.120962-4-tzimmermann@suse.de> <9058368a-0e5b-4cb5-a04f-6feaa80329a0@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <9058368a-0e5b-4cb5-a04f-6feaa80329a0@collabora.com> X-Operating-System: Linux phenom 6.12.30-amd64 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, Jul 11, 2025 at 02:29:04PM +0300, Dmitry Osipenko wrote: > 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 > > Are the fixes and stable tags missing in the patches? AFAICT, the intent > is to fix stable 6.15 kernel regression. Yes, I'll add them when merging to drm-fixes. > > --- > > 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() Reverts shouldn't have any additional changes, even style nits imo, so I'll leave it as-is. > > > 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 Thanks, Sima -- Simona Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch