Attachment 115936 Details for Bug 90537 – winsys/radeon: Unmap VA when destroying BO

[patch] winsys/radeon: Unmap VA when destroying BO

winsys-radeon-unmap-va.diff (text/plain), 1.48 KB, created by Michel Dänzer on 2015-05-21 02:12:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2015-05-21 02:12:41 UTC

Size: 1.48 KB

patch

obsolete

>diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
>index fe98870..ae1fb39 100644
>--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
>+++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
>@@ -305,14 +305,30 @@ static void radeon_bo_destroy(struct pb_buffer *_buf)
>     if (bo->ptr)
>         os_munmap(bo->ptr, bo->base.size);
> 
>+    if (mgr->va) {
>+        struct drm_radeon_gem_va va;
>+        int r;
>+
>+        va.handle = bo->handle;
>+        va.vm_id = 0;
>+        va.operation = RADEON_VA_UNMAP;
>+        va.flags = RADEON_VM_PAGE_READABLE |
>+                   RADEON_VM_PAGE_WRITEABLE |
>+                   RADEON_VM_PAGE_SNOOPED;
>+        va.offset = bo->va;
>+        r = drmCommandWriteRead(bo->rws->fd, DRM_RADEON_GEM_VA, &va, sizeof(va));
>+        if (r && va.operation == RADEON_VA_RESULT_ERROR) {
>+            fprintf(stderr, "radeon: Failed to deallocate virtual address for buffer:\n");
>+            fprintf(stderr, "radeon:    size      : %d bytes\n", bo->base.size);
>+            fprintf(stderr, "radeon:    va        : 0x%016llx\n", (unsigned long long)bo->va);
>+        } else
>+            radeon_bomgr_free_va(mgr, bo->va, bo->base.size);
>+    }
>+
>     /* Close object. */
>     args.handle = bo->handle;
>     drmIoctl(bo->rws->fd, DRM_IOCTL_GEM_CLOSE, &args);
> 
>-    if (mgr->va) {
>-        radeon_bomgr_free_va(mgr, bo->va, bo->base.size);
>-    }
>-
>     pipe_mutex_destroy(bo->map_mutex);
> 
>     if (bo->initial_domain & RADEON_DOMAIN_VRAM)

Actions: View | Splinter Review

Attachments on bug 90537: 115927 | 115936 | 116008 | 116009 | 116054

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.