From: Marek Olšák <marek.olsak@amd.com>
Date: Wed, 21 Aug 2019 02:44:16 +0000 (-0400)
Subject: winsys/amdgpu+radeon: process AMD_DEBUG in addition to R600_DEBUG
X-Git-Tag: upstream/19.3.0~2438
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d9a453c7479f258e42578c5937c513668134b66e;p=platform%2Fupstream%2Fmesa.git

winsys/amdgpu+radeon: process AMD_DEBUG in addition to R600_DEBUG

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
---

diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
index 11dcf94..a89432d 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 75d41ef..1630e93 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
@@ -590,7 +590,8 @@ static bool do_winsys_init(struct radeon_drm_winsys *ws)
     ws->info.has_graphics = true;
     ws->info.cpdma_prefetch_writes_memory = 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;
 }