Am 04.03.20 um 16:17 schrieb Luben Tuikov:
Add fine-grained per-ASIC TMZ support.

At the moment TMZ support is experimental for all
ASICs which support it.

Signed-off-by: Luben Tuikov <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>

I've pushed the fixes for TMZ buffer moves this morning, so I think we should be clear to even enable it by default for at least Raven.

But either way this patch is: Reviewed-by: Christian König <[email protected]>

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 30 ++++++++++++++++---------
  1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
index 61a743368302..4f8fd067d150 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
@@ -383,18 +383,28 @@ int amdgpu_gmc_allocate_vm_inv_eng(struct amdgpu_device 
*adev)
   */
  void amdgpu_gmc_tmz_set(struct amdgpu_device *adev)
  {
-       if (!amdgpu_tmz)
-               return;
-
-       if (adev->asic_type < CHIP_RAVEN ||
-           adev->asic_type == CHIP_ARCTURUS) {
+       switch (adev->asic_type) {
+       case CHIP_RAVEN:
+       case CHIP_RENOIR:
+       case CHIP_NAVI10:
+       case CHIP_NAVI14:
+       case CHIP_NAVI12:
+               /* Don't enable it by default yet.
+                */
+               if (amdgpu_tmz < 1) {
+                       adev->gmc.tmz_enabled = false;
+                       dev_info(adev->dev,
+                                "Trusted Memory Zone (TMZ) feature disabled as 
experimental (default)\n");
+               } else {
+                       adev->gmc.tmz_enabled = true;
+                       dev_info(adev->dev,
+                                "Trusted Memory Zone (TMZ) feature enabled as 
experimental (cmd line)\n");
+               }
+               break;
+       default:
                adev->gmc.tmz_enabled = false;
                dev_warn(adev->dev,
                         "Trusted Memory Zone (TMZ) feature not supported\n");
-       } else {
-
-               adev->gmc.tmz_enabled = true;
-               dev_info(adev->dev,
-                        "Trusted Memory Zone (TMZ) feature supported and 
enabled\n");
+               break;
        }
  }

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reply via email to