Commit b9cbd510 authored by Graham Sider's avatar Graham Sider Committed by Alex Deucher
Browse files

drm/amdgpu/bu: update mtype_local parameter settings 



Update mtype_local module parameter to use MTYPE_RW by default.

0: MTYPE_RW (default)
1: MTYPE_NC
2: MTYPE_CC

Signed-off-by: default avatarGraham Sider <Graham.Sider@amd.com>
Reviewed-by: default avatarHarish Kasiviswanathan <Harish.Kasiviswanathan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 76eb9c95

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

+1 −1
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ module_param_named(no_queue_eviction_on_vm_fault, amdgpu_no_queue_eviction_on_vm 
 * DOC: mtype_local (int)

 */

int amdgpu_mtype_local;

MODULE_PARM_DESC(mtype_local, "MTYPE for local memory (0 = MTYPE_CC (default), 1 = MTYPE_NC, 2 = MTYPE_RW)");

MODULE_PARM_DESC(mtype_local, "MTYPE for local memory (0 = MTYPE_RW (default), 1 = MTYPE_NC, 2 = MTYPE_CC)");

module_param_named(mtype_local, amdgpu_mtype_local, int, 0444);



/**

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

+6 −6
Original line number Diff line number Diff line
@@ -1235,15 +1235,15 @@ static void gmc_v9_0_get_coherence_flags(struct amdgpu_device *adev, 
		 * NUMA systems. Their MTYPE can be overridden per-page in

		 * gmc_v9_0_override_vm_pte_flags.

		 */

		mtype_local = MTYPE_CC;

		mtype_local = MTYPE_RW;

		if (amdgpu_mtype_local == 1) {

			DRM_INFO_ONCE("Using MTYPE_NC for local memory\n");

			mtype_local = MTYPE_NC;

		} else if (amdgpu_mtype_local == 2) {

			DRM_INFO_ONCE("Using MTYPE_RW for local memory\n");

			mtype_local = MTYPE_RW;

		} else {

			DRM_INFO_ONCE("Using MTYPE_CC for local memory\n");

			mtype_local = MTYPE_CC;

		} else {

			DRM_INFO_ONCE("Using MTYPE_RW for local memory\n");

		}

		is_local = (!is_vram && (adev->flags & AMD_IS_APU) &&

			    num_possible_nodes() <= 1) ||
@@ -1359,12 +1359,12 @@ static void gmc_v9_0_override_vm_pte_flags(struct amdgpu_device *adev, 
		/*vm->mem_id*/0, local_node, nid);

	if (nid == local_node) {

		uint64_t old_flags = *flags;

		unsigned int mtype_local = MTYPE_CC;

		unsigned int mtype_local = MTYPE_RW;



		if (amdgpu_mtype_local == 1)

			mtype_local = MTYPE_NC;

		else if (amdgpu_mtype_local == 2)

			mtype_local = MTYPE_RW;

			mtype_local = MTYPE_CC;



		*flags = (*flags & ~AMDGPU_PTE_MTYPE_VG10_MASK) |

			 AMDGPU_PTE_MTYPE_VG10(mtype_local);

drivers/gpu/drm/amd/amdkfd/kfd_svm.c

+2 −1
Original line number Diff line number Diff line
@@ -1192,7 +1192,8 @@ svm_range_get_pte_flags(struct kfd_node *node, 
		}

		break;

	case IP_VERSION(9, 4, 3):

		mtype_local = amdgpu_mtype_local == 1 ? AMDGPU_VM_MTYPE_NC : (amdgpu_mtype_local == 2 ? AMDGPU_VM_MTYPE_RW : AMDGPU_VM_MTYPE_CC);

		mtype_local = amdgpu_mtype_local == 1 ? AMDGPU_VM_MTYPE_NC :

			     (amdgpu_mtype_local == 2 ? AMDGPU_VM_MTYPE_CC : AMDGPU_VM_MTYPE_RW);

		snoop = true;

		if (uncached) {

			mapping_flags |= AMDGPU_VM_MTYPE_UC;