diff options
| author | Marek Olšák <[email protected]> | 2019-08-20 22:44:16 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2019-08-27 16:10:40 -0400 |
| commit | a935da7cef0b4f0874d974a66f2d87b440a53854 (patch) | |
| tree | 1854b94fc5b31c7dbcda132327f1be99fdd80b7a /src/gallium/winsys | |
| parent | b9330a6189c8f46c128a914ea4eb46c4990ccfe3 (diff) | |
winsys/amdgpu+radeon: process AMD_DEBUG in addition to R600_DEBUG
Diffstat (limited to 'src/gallium/winsys')
| -rw-r--r-- | src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 9 | ||||
| -rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c index 11dcf942c12..a89432d8594 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c @@ -106,11 +106,14 @@ static bool do_winsys_init(struct amdgpu_winsys *ws, goto fail; } - ws->check_vm = strstr(debug_get_option("R600_DEBUG", ""), "check_vm") != NULL; + ws->check_vm = strstr(debug_get_option("R600_DEBUG", ""), "check_vm") != NULL || + strstr(debug_get_option("AMD_DEBUG", ""), "check_vm") != NULL; ws->debug_all_bos = debug_get_option_all_bos(); - ws->reserve_vmid = strstr(debug_get_option("R600_DEBUG", ""), "reserve_vmid") != NULL; + ws->reserve_vmid = strstr(debug_get_option("R600_DEBUG", ""), "reserve_vmid") != NULL || + strstr(debug_get_option("AMD_DEBUG", ""), "reserve_vmid") != NULL; ws->zero_all_vram_allocs = strstr(debug_get_option("R600_DEBUG", ""), "zerovram") != NULL || - driQueryOptionb(config->options, "radeonsi_zerovram"); + strstr(debug_get_option("AMD_DEBUG", ""), "zerovram") != NULL || + driQueryOptionb(config->options, "radeonsi_zerovram"); return true; diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c index 07f8318d94a..31979550aed 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c @@ -589,7 +589,8 @@ static bool do_winsys_init(struct radeon_drm_winsys *ws) ws->info.max_alignment = 1024*1024; ws->info.has_graphics = true; - ws->check_vm = strstr(debug_get_option("R600_DEBUG", ""), "check_vm") != NULL; + ws->check_vm = strstr(debug_get_option("R600_DEBUG", ""), "check_vm") != NULL || + strstr(debug_get_option("AMD_DEBUG", ""), "check_vm") != NULL; return true; } |