Commit 35d5f224 authored by Oak Zeng's avatar Oak Zeng Committed by Alex Deucher
Browse files

drm/amdgpu: Don't reserve vram as WC for A+A 



On A+A platform, vram can be mapped as WB. Not necessarily
to always map vram as WC on such platform.

Calling function arch_io_reserve_memtype_wc will mark the
whole vram region as WC. So don't call it for A+A platform.

Signed-off-by: default avatarOak Zeng <Oak.Zeng@amd.com>
Suggested-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Acked-by: default avatarChristian Konig <christian.koenig@amd.com>
Reviewed-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent debd629a

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

+14 −8
Original line number Diff line number Diff line
@@ -1065,6 +1065,8 @@ static const char *amdgpu_vram_names[] = { 
 */

int amdgpu_bo_init(struct amdgpu_device *adev)

{

	/* On A+A platform, VRAM can be mapped as WB */

	if (!adev->gmc.xgmi.connected_to_cpu) {

		/* reserve PAT memory space to WC for VRAM */

		arch_io_reserve_memtype_wc(adev->gmc.aper_base,

				adev->gmc.aper_size);
@@ -1072,6 +1074,8 @@ int amdgpu_bo_init(struct amdgpu_device *adev) 
		/* Add an MTRR for the VRAM */

		adev->gmc.vram_mtrr = arch_phys_wc_add(adev->gmc.aper_base,

				adev->gmc.aper_size);

	}



	DRM_INFO("Detected VRAM RAM=%lluM, BAR=%lluM\n",

		 adev->gmc.mc_vram_size >> 20,

		 (unsigned long long)adev->gmc.aper_size >> 20);
@@ -1089,9 +1093,11 @@ int amdgpu_bo_init(struct amdgpu_device *adev) 
void amdgpu_bo_fini(struct amdgpu_device *adev)

{

	amdgpu_ttm_fini(adev);

	if (!adev->gmc.xgmi.connected_to_cpu) {

		arch_phys_wc_del(adev->gmc.vram_mtrr);

		arch_io_free_memtype_wc(adev->gmc.aper_base, adev->gmc.aper_size);

	}

}



/**

 * amdgpu_bo_fbdev_mmap - mmap fbdev memory