Attachment 144427 Details for Bug 110781 – Simple diff/patch to test the issue

[patch] Simple diff/patch to test the issue

my_hack.diff (text/plain), 3.63 KB, created by Richard Thier on 2019-06-03 13:36:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Richard Thier

Created: 2019-06-03 13:36:49 UTC

Size: 3.63 KB

patch

obsolete

>diff --git a/src/gallium/drivers/radeon/r600_buffer_common.c b/src/gallium/drivers/radeon/r600_buffer_common.c
>index 4f5e17d5c89..c21a2941e2b 100644
>--- a/src/gallium/drivers/radeon/r600_buffer_common.c
>+++ b/src/gallium/drivers/radeon/r600_buffer_common.c
>@@ -169,6 +169,7 @@ void r600_init_resource_fields(struct r600_common_screen *rscreen,
> 
> 	/* Only displayable single-sample textures can be shared between
> 	 * processes. */
>+	fprintf(stderr, "Prenex in r600_buffer_common.c - I suspect this does not happen!\n");
> 	if (res->b.b.target == PIPE_BUFFER ||
> 	    res->b.b.nr_samples >= 2 ||
> 	    rtex->surface.micro_tile_mode != RADEON_MICRO_MODE_DISPLAY)
>diff --git a/src/gallium/drivers/radeon/radeon_winsys.h b/src/gallium/drivers/radeon/radeon_winsys.h
>index f0a0a922a10..2de568bbc22 100644
>--- a/src/gallium/drivers/radeon/radeon_winsys.h
>+++ b/src/gallium/drivers/radeon/radeon_winsys.h
>@@ -660,8 +660,10 @@ static inline enum radeon_bo_domain radeon_domain_from_heap(enum radeon_heap hea
> 
> static inline unsigned radeon_flags_from_heap(enum radeon_heap heap)
> {
>+    fprintf(stderr, "Prenex in radeon_winsys.h - radeon_heap in flags from heap: %d\n", (unsigned int)heap);
>     switch (heap) {
>     case RADEON_HEAP_VRAM_NO_CPU_ACCESS:
>+        fprintf(stderr, "Prenex in radeon_winsys.h: RADEON_HEAP_VRAM_NO_CPU_ACCESS\n");
>         return RADEON_FLAG_GTT_WC |
>                RADEON_FLAG_NO_CPU_ACCESS |
>                RADEON_FLAG_NO_INTERPROCESS_SHARING;
>@@ -669,11 +671,13 @@ static inline unsigned radeon_flags_from_heap(enum radeon_heap heap)
>     case RADEON_HEAP_VRAM:
>     case RADEON_HEAP_VRAM_GTT:
>     case RADEON_HEAP_GTT_WC:
>+        fprintf("stderr, Prenex in radeon_winsys.h: _VRAM | _VRAM_GTT | GTT_WC\n");
>         return RADEON_FLAG_GTT_WC |
>                RADEON_FLAG_NO_INTERPROCESS_SHARING;
> 
>     case RADEON_HEAP_GTT:
>     default:
>+        fprintf(stderr, "Prenex in radeon_winsys.h: default | HEAP GTT\}");
>         return RADEON_FLAG_NO_INTERPROCESS_SHARING;
>     }
> }
>@@ -707,14 +711,18 @@ static inline int radeon_get_heap_index(enum radeon_bo_domain domain,
>     assert(!(flags & RADEON_FLAG_NO_CPU_ACCESS) || domain == RADEON_DOMAIN_VRAM);
> 
>     /* Resources with interprocess sharing don't use any winsys allocators. */
>-    if (!(flags & RADEON_FLAG_NO_INTERPROCESS_SHARING))
>+    if (!(flags & RADEON_FLAG_NO_INTERPROCESS_SHARING)) {
>+        fprintf(stderr, "Prenex in radeon_winsys.h: -1 as radeon_get_heap_index(...) [*]\n");
>         return -1;
>+    }
> 
>     /* Unsupported flags: NO_SUBALLOC, SPARSE. */
>     if (flags & ~(RADEON_FLAG_GTT_WC |
>                   RADEON_FLAG_NO_CPU_ACCESS |
>-                  RADEON_FLAG_NO_INTERPROCESS_SHARING))
>+                  RADEON_FLAG_NO_INTERPROCESS_SHARING)) {
>+        fprintf(stderr, "Prenex in radeon_winsys.h: -1 as radeon_get_heap_index(...) [**]\n");
>         return -1;
>+    }
> 
>     switch (domain) {
>     case RADEON_DOMAIN_VRAM:
>diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
>index 15e9d38e33a..d6f1e6aa851 100644
>--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
>+++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
>@@ -970,6 +970,9 @@ no_slab:
>     alignment = align(alignment, ws->info.gart_page_size);
> 
>     bool use_reusable_pool = flags & RADEON_FLAG_NO_INTERPROCESS_SHARING;
>+    fprintf(stderr, "Prenex in radeon_drm_bo.c: flags=%x use_reusable_pool=%d\n", use_reusable_pool);
>+    fprintf(stderr, "FORCING use_reusable_pool=true\n");
>+    use_reusable_pool=true; // FIXME: this defeats the whole purpose of the flag! Only for testing the slowdown!
> 
>     /* Shared resources don't use cached heaps. */
>     if (use_reusable_pool) {

Actions: View | Splinter Review

Attachments on bug 110781: 144427 | 144431 | 144439 | 144442 | 144454 | 144469 | 144481

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.