On 21.08.25 05:21, Yifan Zhang wrote:
> AMDGPU_HAS_VRAM is redundant with is_app_apu, as both refer to
> APUs with no carve-out. Since AMDGPU_HAS_VRAM only occurs once,
> remove AMDGPU_HAS_VRAM definition. The tmr allocation can be covered
> with AMDGPU_GEM_DOMAIN_GTT | AMDGPU_GEM_DOMAIN_VRAM in both vram and
> non vram ASICs.
>
> Signed-off-by: Yifan Zhang <yifan1.zh...@amd.com>
Reviewed-by: Christian König <christian.koe...@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 6 ------
> drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 4 +---
> 2 files changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index ddd472e56f69..01f53700694b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -946,12 +946,6 @@ enum amdgpu_enforce_isolation_mode {
> AMDGPU_ENFORCE_ISOLATION_NO_CLEANER_SHADER = 3,
> };
>
> -
> -/*
> - * Non-zero (true) if the GPU has VRAM. Zero (false) otherwise.
> - */
> -#define AMDGPU_HAS_VRAM(_adev) ((_adev)->gmc.real_vram_size)
> -
> struct amdgpu_device {
> struct device *dev;
> struct pci_dev *pdev;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> index fa3e55700ad6..d92a73e7f2a2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> @@ -880,9 +880,7 @@ static int psp_tmr_init(struct psp_context *psp)
> pptr = amdgpu_sriov_vf(psp->adev) ? &tmr_buf : NULL;
> ret = amdgpu_bo_create_kernel(psp->adev, tmr_size,
> PSP_TMR_ALIGNMENT,
> - AMDGPU_HAS_VRAM(psp->adev) ?
> - AMDGPU_GEM_DOMAIN_VRAM :
> - AMDGPU_GEM_DOMAIN_GTT,
> + AMDGPU_GEM_DOMAIN_GTT |
> AMDGPU_GEM_DOMAIN_VRAM,
> &psp->tmr_bo, &psp->tmr_mc_addr,
> pptr);
> }
