Commit cab7d478 authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amdgpu: Add IP instance map for aqua vanjaram 



Add XCC logical to physical instance map for aqua vanjaram

v2:
	Keep look up table only for required IPs, for others return
default mapping (Felix).

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarLe Ma <Le.Ma@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6df442a0

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

+13 −0
Original line number Original line Diff line number Diff line
@@ -1951,6 +1951,17 @@ static int amdgpu_discovery_set_mes_ip_blocks(struct amdgpu_device *adev) 
	return 0;

	return 0;

}

}





static void amdgpu_discovery_ip_map_init(struct amdgpu_device *adev)

{

	switch (adev->ip_versions[GC_HWIP][0]) {

	case IP_VERSION(9, 4, 3):

		aqua_vanjaram_ip_map_init(adev);

		break;

	default:

		break;

	}

}



int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)

int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)

{

{

	int r;

	int r;
@@ -2128,6 +2139,8 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev) 
		break;

		break;

	}

	}





	amdgpu_discovery_ip_map_init(adev);



	switch (adev->ip_versions[GC_HWIP][0]) {

	switch (adev->ip_versions[GC_HWIP][0]) {

	case IP_VERSION(9, 0, 1):

	case IP_VERSION(9, 0, 1):

	case IP_VERSION(9, 2, 1):

	case IP_VERSION(9, 2, 1):

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

+39 −0
Original line number Original line Diff line number Diff line
@@ -50,3 +50,42 @@ void aqua_vanjaram_doorbell_index_init(struct amdgpu_device *adev) 




	adev->doorbell_index.max_assignment = AMDGPU_DOORBELL_LAYOUT1_MAX_ASSIGNMENT << 1;

	adev->doorbell_index.max_assignment = AMDGPU_DOORBELL_LAYOUT1_MAX_ASSIGNMENT << 1;

}

}



static int8_t aqua_vanjaram_logical_to_dev_inst(struct amdgpu_device *adev,

					 enum amd_hw_ip_block_type block,

					 int8_t inst)

{

	int8_t dev_inst;



	switch (block) {

	case GC_HWIP:

		dev_inst = adev->ip_map.dev_inst[block][inst];

		break;

	default:

		/* For rest of the IPs, no look up required.

		 * Assume 'logical instance == physical instance' for all configs. */

		dev_inst = inst;

		break;

	}



	return dev_inst;

}



void aqua_vanjaram_ip_map_init(struct amdgpu_device *adev)

{

	int xcc_mask;

	int l, i;



	/* Map GC instances */

	l = 0;

	xcc_mask = adev->gfx.xcc_mask;

	while (xcc_mask) {

		i = ffs(xcc_mask) - 1;

		adev->ip_map.dev_inst[GC_HWIP][l++] = i;

		xcc_mask &= ~(1 << i);

	}

	for (; l < HWIP_MAX_INSTANCE; l++)

		adev->ip_map.dev_inst[GC_HWIP][l] = -1;



	adev->ip_map.logical_to_dev_inst = aqua_vanjaram_logical_to_dev_inst;

}

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -111,6 +111,7 @@ int vega10_reg_base_init(struct amdgpu_device *adev); 
int vega20_reg_base_init(struct amdgpu_device *adev);

int vega20_reg_base_init(struct amdgpu_device *adev);

int arct_reg_base_init(struct amdgpu_device *adev);

int arct_reg_base_init(struct amdgpu_device *adev);

int aldebaran_reg_base_init(struct amdgpu_device *adev);

int aldebaran_reg_base_init(struct amdgpu_device *adev);

void aqua_vanjaram_ip_map_init(struct amdgpu_device *adev);





void vega10_doorbell_index_init(struct amdgpu_device *adev);

void vega10_doorbell_index_init(struct amdgpu_device *adev);

void vega20_doorbell_index_init(struct amdgpu_device *adev);

void vega20_doorbell_index_init(struct amdgpu_device *adev);