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

drm/amdgpu: add support for gmc10 for gc 10.3.6 



this patch adds support for gmc10.

Signed-off-by: default avatarYifan Zhang <yifan1.zhang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 50e14a62

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

+1 −0
Original line number Diff line number Diff line
@@ -1215,6 +1215,7 @@ static int amdgpu_discovery_set_gmc_ip_blocks(struct amdgpu_device *adev) 
	case IP_VERSION(10, 3, 3):

	case IP_VERSION(10, 3, 4):

	case IP_VERSION(10, 3, 5):

	case IP_VERSION(10, 3, 6):

	case IP_VERSION(10, 3, 7):

		amdgpu_device_ip_block_add(adev, &gmc_v10_0_ip_block);

		break;

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

+3 −0
Original line number Diff line number Diff line
@@ -697,6 +697,7 @@ static void gmc_v10_0_set_mmhub_funcs(struct amdgpu_device *adev) 
	switch (adev->ip_versions[MMHUB_HWIP][0]) {

	case IP_VERSION(2, 3, 0):

	case IP_VERSION(2, 4, 0):

	case IP_VERSION(2, 4, 1):

		adev->mmhub.funcs = &mmhub_v2_3_funcs;

		break;

	default:
@@ -713,6 +714,7 @@ static void gmc_v10_0_set_gfxhub_funcs(struct amdgpu_device *adev) 
	case IP_VERSION(10, 3, 1):

	case IP_VERSION(10, 3, 4):

	case IP_VERSION(10, 3, 5):

	case IP_VERSION(10, 3, 6):

	case IP_VERSION(10, 3, 3):

	case IP_VERSION(10, 3, 7):

		adev->gfxhub.funcs = &gfxhub_v2_1_funcs;
@@ -894,6 +896,7 @@ static int gmc_v10_0_sw_init(void *handle) 
	case IP_VERSION(10, 3, 1):

	case IP_VERSION(10, 3, 4):

	case IP_VERSION(10, 3, 5):

	case IP_VERSION(10, 3, 6):

	case IP_VERSION(10, 3, 3):

	case IP_VERSION(10, 3, 7):

		adev->num_vmhubs = 2;

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

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ mmhub_v2_3_print_l2_protection_fault_status(struct amdgpu_device *adev, 
	switch (adev->ip_versions[MMHUB_HWIP][0]) {

	case IP_VERSION(2, 3, 0):

	case IP_VERSION(2, 4, 0):

	case IP_VERSION(2, 4, 1):

		mmhub_cid = mmhub_client_ids_vangogh[cid][rw];

		break;

	default: