[PATCH] drm/amdgpu: enable TMZ by default on Raven asics

[Christian König]

Am 25.02.21 um 17:44 schrieb Alex Deucher:
> This has been stable for a while.
>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c |  4 ++--
>   drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 10 ++++++++++
>   2 files changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> index 2f71d36d2856..21504ea9085f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> @@ -164,7 +164,7 @@ int amdgpu_discovery = -1;
>   int amdgpu_mes;
>   int amdgpu_noretry = -1;
>   int amdgpu_force_asic_type = -1;
> -int amdgpu_tmz;
> +int amdgpu_tmz = -1; /* auto */
>   int amdgpu_reset_method = -1; /* auto */
>   int amdgpu_num_kcq = -1;
>   
> @@ -790,7 +790,7 @@ module_param_named(abmlevel, amdgpu_dm_abm_level, uint, 0444);
>    *
>    * The default value: 0 (off).  TODO: change to auto till it is completed.
>    */
> -MODULE_PARM_DESC(tmz, "Enable TMZ feature (-1 = auto, 0 = off (default), 1 = on)");
> +MODULE_PARM_DESC(tmz, "Enable TMZ feature (-1 = auto (default), 0 = off, 1 = on)");
>   module_param_named(tmz, amdgpu_tmz, int, 0444);
>   
>   /**
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
> index fe1a39ffda72..1a892526d020 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
> @@ -384,6 +384,16 @@ void amdgpu_gmc_tmz_set(struct amdgpu_device *adev)
>   {
>   	switch (adev->asic_type) {
>   	case CHIP_RAVEN:
> +		if (amdgpu_tmz == 0) {
> +			adev->gmc.tmz_enabled = false;
> +			dev_info(adev->dev,
> +				 "Trusted Memory Zone (TMZ) feature disabled (cmd line)\n");
> +		} else {
> +			adev->gmc.tmz_enabled = true;
> +			dev_info(adev->dev,
> +				 "Trusted Memory Zone (TMZ) feature enabled\n");
> +		}
> +		break;
>   	case CHIP_RENOIR:
>   	case CHIP_NAVI10:
>   	case CHIP_NAVI14: