[PATCH 3/9] Revert "drm/virtio: Use dma_buf from GEM object instance"

[Thomas Zimmermann]

Hi

Am 11.07.25 um 13:49 schrieb Dmitry Osipenko:
> On 7/11/25 14:31, Simona Vetter wrote:
>> 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 <tzimmermann at suse.de>
>>> 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.
> On a second look, I don't see the reverted commits in 6.15, so only
> 6.16-rc should be affected.
>
>>>> ---
>>>>   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.
> AFAICS, this patch is not a direct/clean revert, it reverts two commits
> with manual edit. There is 44b6535d8ace on top of the reverted
> 415cb45895f4 and final result isn't same as a revert of 415cb45895f4.

It's exactly the revert mentioned in the commit message. There was a 
conflict at

-		struct dma_buf *dmabuf = bo->dma_buf;
+		struct dma_buf *dmabuf = attach->dmabuf;


which I resolved.

Best regards
Thomas



>

-- 
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nuernberg)