Commit c89d2a2f authored by Peng Ju Zhou's avatar Peng Ju Zhou Committed by Alex Deucher
Browse files

drm/amd/amdgpu: add instance_number check in amdgpu_discovery_get_ip_version 



The original code returns IP version of instantce_0 for every IP. This implementation may be correct for most of IPs.

However, for certain IP block (VCN for example), it may have 2 instances and
both of them have the same hw_id, BUT they have different revision number (0 and 1).

In this case, the original amdgpu_discovery_get_ip_version cannot correct reflects
the result and returns false information

Signed-off-by: default avatarBokun Zhang <Bokun.Zhang@amd.com>
Signed-off-by: default avatarPeng Ju Zhou <PengJu.Zhou@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2f0cf910

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

+2 −2
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev) 
	return 0;

}



int amdgpu_discovery_get_ip_version(struct amdgpu_device *adev, int hw_id,

int amdgpu_discovery_get_ip_version(struct amdgpu_device *adev, int hw_id, int number_instance,

				    int *major, int *minor, int *revision)

{

	struct binary_header *bhdr;
@@ -357,7 +357,7 @@ int amdgpu_discovery_get_ip_version(struct amdgpu_device *adev, int hw_id, 
		for (j = 0; j < num_ips; j++) {

			ip = (struct ip *)(adev->mman.discovery_bin + ip_offset);



			if (le16_to_cpu(ip->hw_id) == hw_id) {

			if ((le16_to_cpu(ip->hw_id) == hw_id) && (ip->number_instance == number_instance)) {

				if (major)

					*major = ip->major;

				if (minor)

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

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
void amdgpu_discovery_fini(struct amdgpu_device *adev);

int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev);

void amdgpu_discovery_harvest_ip(struct amdgpu_device *adev);

int amdgpu_discovery_get_ip_version(struct amdgpu_device *adev, int hw_id,

int amdgpu_discovery_get_ip_version(struct amdgpu_device *adev, int hw_id, int number_instance,

                                    int *major, int *minor, int *revision);

int amdgpu_discovery_get_gfx_info(struct amdgpu_device *adev);