drm/amdgpu/discovery: add ISP discovery entries for old APUs

Raven1/2 and Picasso have ISP 2.0.0, however their ISP blocks
are not in the IP discovery table yet.

This commit fixes this issue by adding new ISP entries for
Raven and Picasso in the IP discovery table.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Zhu Lingshan <lingshan.zhu@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 9f9a1867da722e2afcaf1854b745d777f95bb9b2..73f4d56c5de4acc8f67b4ff7b043d62be19324b8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -2530,6 +2530,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
                        adev->ip_versions[GC_HWIP][0] = IP_VERSION(9, 2, 2);
                        adev->ip_versions[UVD_HWIP][0] = IP_VERSION(1, 0, 1);
                        adev->ip_versions[DCE_HWIP][0] = IP_VERSION(1, 0, 1);
+                       adev->ip_versions[ISP_HWIP][0] = IP_VERSION(2, 0, 0);
                } else {
                        adev->ip_versions[MMHUB_HWIP][0] = IP_VERSION(9, 1, 0);
                        adev->ip_versions[ATHUB_HWIP][0] = IP_VERSION(9, 1, 0);
@@ -2546,6 +2547,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
                        adev->ip_versions[GC_HWIP][0] = IP_VERSION(9, 1, 0);
                        adev->ip_versions[UVD_HWIP][0] = IP_VERSION(1, 0, 0);
                        adev->ip_versions[DCE_HWIP][0] = IP_VERSION(1, 0, 0);
+                       adev->ip_versions[ISP_HWIP][0] = IP_VERSION(2, 0, 0);
                }
                break;
        case CHIP_VEGA20: