]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/vmwgfx: Reserve fence slots on buffer objects in cotables
authorZack Rusin <zackr@vmware.com>
Fri, 22 Apr 2022 16:13:42 +0000 (12:13 -0400)
committerZack Rusin <zackr@vmware.com>
Sat, 23 Apr 2022 01:41:14 +0000 (21:41 -0400)
The buffer objects created by cotables were missing fence reservations.
They are created from vmw_validation_res_validate which makes them miss
the ttm_eu_reserve_buffers which is called from vmw_validation_bo_reserve.

Cotables are the only resources which create a buffer object in the
create callback so make sure the code also reserves the slots.

Signed-off-by: Zack Rusin <zackr@vmware.com>
Co-developed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Fixes: 6f3996ca4dfb ("dma-buf/drivers: make reserving a shared slot mandatory v4")
Link: https://patchwork.freedesktop.org/patch/msgid/20220422161342.1142584-1-zack@kde.org
drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c

index 16f986b6cbea3fb1fcfa5c349bd21f3f860217d7..79b30dc9d82535c6370017156a602ec31e9384b7 100644 (file)
@@ -478,6 +478,10 @@ static int vmw_cotable_resize(struct vmw_resource *res, size_t new_size)
        vmw_bo_unreference(&old_buf);
        res->id = vcotbl->type;
 
+       ret = dma_resv_reserve_fences(bo->base.resv, 1);
+       if (unlikely(ret))
+               goto out_wait;
+
        /* Release the pin acquired in vmw_bo_init */
        ttm_bo_unpin(bo);