Commit e68197aa authored by Yifan Zhang's avatar Yifan Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: remove redundant AMDGPU_HAS_VRAM 



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: default avatarYifan Zhang <yifan1.zhang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b9dba6a6

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+0 −6
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

	}