aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/cik.c17
-rw-r--r--drivers/gpu/drm/amd/amdgpu/si.c13
2 files changed, 16 insertions, 14 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
index 78ab939ae5d8..f41f5f57e9f3 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik.c
@@ -2002,6 +2002,8 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)
2002 amdgpu_device_ip_block_add(adev, &cik_common_ip_block); 2002 amdgpu_device_ip_block_add(adev, &cik_common_ip_block);
2003 amdgpu_device_ip_block_add(adev, &gmc_v7_0_ip_block); 2003 amdgpu_device_ip_block_add(adev, &gmc_v7_0_ip_block);
2004 amdgpu_device_ip_block_add(adev, &cik_ih_ip_block); 2004 amdgpu_device_ip_block_add(adev, &cik_ih_ip_block);
2005 amdgpu_device_ip_block_add(adev, &gfx_v7_2_ip_block);
2006 amdgpu_device_ip_block_add(adev, &cik_sdma_ip_block);
2005 if (amdgpu_dpm == -1) 2007 if (amdgpu_dpm == -1)
2006 amdgpu_device_ip_block_add(adev, &pp_smu_ip_block); 2008 amdgpu_device_ip_block_add(adev, &pp_smu_ip_block);
2007 else 2009 else
@@ -2014,8 +2016,6 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)
2014#endif 2016#endif
2015 else 2017 else
2016 amdgpu_device_ip_block_add(adev, &dce_v8_2_ip_block); 2018 amdgpu_device_ip_block_add(adev, &dce_v8_2_ip_block);
2017 amdgpu_device_ip_block_add(adev, &gfx_v7_2_ip_block);
2018 amdgpu_device_ip_block_add(adev, &cik_sdma_ip_block);
2019 amdgpu_device_ip_block_add(adev, &uvd_v4_2_ip_block); 2019 amdgpu_device_ip_block_add(adev, &uvd_v4_2_ip_block);
2020 amdgpu_device_ip_block_add(adev, &vce_v2_0_ip_block); 2020 amdgpu_device_ip_block_add(adev, &vce_v2_0_ip_block);
2021 break; 2021 break;
@@ -2023,6 +2023,8 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)
2023 amdgpu_device_ip_block_add(adev, &cik_common_ip_block); 2023 amdgpu_device_ip_block_add(adev, &cik_common_ip_block);
2024 amdgpu_device_ip_block_add(adev, &gmc_v7_0_ip_block); 2024 amdgpu_device_ip_block_add(adev, &gmc_v7_0_ip_block);
2025 amdgpu_device_ip_block_add(adev, &cik_ih_ip_block); 2025 amdgpu_device_ip_block_add(adev, &cik_ih_ip_block);
2026 amdgpu_device_ip_block_add(adev, &gfx_v7_3_ip_block);
2027 amdgpu_device_ip_block_add(adev, &cik_sdma_ip_block);
2026 if (amdgpu_dpm == -1) 2028 if (amdgpu_dpm == -1)
2027 amdgpu_device_ip_block_add(adev, &pp_smu_ip_block); 2029 amdgpu_device_ip_block_add(adev, &pp_smu_ip_block);
2028 else 2030 else
@@ -2035,8 +2037,6 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)
2035#endif 2037#endif
2036 else 2038 else
2037 amdgpu_device_ip_block_add(adev, &dce_v8_5_ip_block); 2039 amdgpu_device_ip_block_add(adev, &dce_v8_5_ip_block);
2038 amdgpu_device_ip_block_add(adev, &gfx_v7_3_ip_block);
2039 amdgpu_device_ip_block_add(adev, &cik_sdma_ip_block);
2040 amdgpu_device_ip_block_add(adev, &uvd_v4_2_ip_block); 2040 amdgpu_device_ip_block_add(adev, &uvd_v4_2_ip_block);
2041 amdgpu_device_ip_block_add(adev, &vce_v2_0_ip_block); 2041 amdgpu_device_ip_block_add(adev, &vce_v2_0_ip_block);
2042 break; 2042 break;
@@ -2044,6 +2044,8 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)
2044 amdgpu_device_ip_block_add(adev, &cik_common_ip_block); 2044 amdgpu_device_ip_block_add(adev, &cik_common_ip_block);
2045 amdgpu_device_ip_block_add(adev, &gmc_v7_0_ip_block); 2045 amdgpu_device_ip_block_add(adev, &gmc_v7_0_ip_block);
2046 amdgpu_device_ip_block_add(adev, &cik_ih_ip_block); 2046 amdgpu_device_ip_block_add(adev, &cik_ih_ip_block);
2047 amdgpu_device_ip_block_add(adev, &gfx_v7_1_ip_block);
2048 amdgpu_device_ip_block_add(adev, &cik_sdma_ip_block);
2047 amdgpu_device_ip_block_add(adev, &kv_smu_ip_block); 2049 amdgpu_device_ip_block_add(adev, &kv_smu_ip_block);
2048 if (adev->enable_virtual_display) 2050 if (adev->enable_virtual_display)
2049 amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block); 2051 amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
@@ -2053,8 +2055,7 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)
2053#endif 2055#endif
2054 else 2056 else
2055 amdgpu_device_ip_block_add(adev, &dce_v8_1_ip_block); 2057 amdgpu_device_ip_block_add(adev, &dce_v8_1_ip_block);
2056 amdgpu_device_ip_block_add(adev, &gfx_v7_1_ip_block); 2058
2057 amdgpu_device_ip_block_add(adev, &cik_sdma_ip_block);
2058 amdgpu_device_ip_block_add(adev, &uvd_v4_2_ip_block); 2059 amdgpu_device_ip_block_add(adev, &uvd_v4_2_ip_block);
2059 amdgpu_device_ip_block_add(adev, &vce_v2_0_ip_block); 2060 amdgpu_device_ip_block_add(adev, &vce_v2_0_ip_block);
2060 break; 2061 break;
@@ -2063,6 +2064,8 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)
2063 amdgpu_device_ip_block_add(adev, &cik_common_ip_block); 2064 amdgpu_device_ip_block_add(adev, &cik_common_ip_block);
2064 amdgpu_device_ip_block_add(adev, &gmc_v7_0_ip_block); 2065 amdgpu_device_ip_block_add(adev, &gmc_v7_0_ip_block);
2065 amdgpu_device_ip_block_add(adev, &cik_ih_ip_block); 2066 amdgpu_device_ip_block_add(adev, &cik_ih_ip_block);
2067 amdgpu_device_ip_block_add(adev, &gfx_v7_2_ip_block);
2068 amdgpu_device_ip_block_add(adev, &cik_sdma_ip_block);
2066 amdgpu_device_ip_block_add(adev, &kv_smu_ip_block); 2069 amdgpu_device_ip_block_add(adev, &kv_smu_ip_block);
2067 if (adev->enable_virtual_display) 2070 if (adev->enable_virtual_display)
2068 amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block); 2071 amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
@@ -2072,8 +2075,6 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)
2072#endif 2075#endif
2073 else 2076 else
2074 amdgpu_device_ip_block_add(adev, &dce_v8_3_ip_block); 2077 amdgpu_device_ip_block_add(adev, &dce_v8_3_ip_block);
2075 amdgpu_device_ip_block_add(adev, &gfx_v7_2_ip_block);
2076 amdgpu_device_ip_block_add(adev, &cik_sdma_ip_block);
2077 amdgpu_device_ip_block_add(adev, &uvd_v4_2_ip_block); 2078 amdgpu_device_ip_block_add(adev, &uvd_v4_2_ip_block);
2078 amdgpu_device_ip_block_add(adev, &vce_v2_0_ip_block); 2079 amdgpu_device_ip_block_add(adev, &vce_v2_0_ip_block);
2079 break; 2080 break;
diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c
index c364ef94cc36..f8408f88cd37 100644
--- a/drivers/gpu/drm/amd/amdgpu/si.c
+++ b/drivers/gpu/drm/amd/amdgpu/si.c
@@ -2057,13 +2057,13 @@ int si_set_ip_blocks(struct amdgpu_device *adev)
2057 amdgpu_device_ip_block_add(adev, &si_common_ip_block); 2057 amdgpu_device_ip_block_add(adev, &si_common_ip_block);
2058 amdgpu_device_ip_block_add(adev, &gmc_v6_0_ip_block); 2058 amdgpu_device_ip_block_add(adev, &gmc_v6_0_ip_block);
2059 amdgpu_device_ip_block_add(adev, &si_ih_ip_block); 2059 amdgpu_device_ip_block_add(adev, &si_ih_ip_block);
2060 amdgpu_device_ip_block_add(adev, &gfx_v6_0_ip_block);
2061 amdgpu_device_ip_block_add(adev, &si_dma_ip_block);
2060 amdgpu_device_ip_block_add(adev, &si_smu_ip_block); 2062 amdgpu_device_ip_block_add(adev, &si_smu_ip_block);
2061 if (adev->enable_virtual_display) 2063 if (adev->enable_virtual_display)
2062 amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block); 2064 amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
2063 else 2065 else
2064 amdgpu_device_ip_block_add(adev, &dce_v6_0_ip_block); 2066 amdgpu_device_ip_block_add(adev, &dce_v6_0_ip_block);
2065 amdgpu_device_ip_block_add(adev, &gfx_v6_0_ip_block);
2066 amdgpu_device_ip_block_add(adev, &si_dma_ip_block);
2067 /* amdgpu_device_ip_block_add(adev, &uvd_v3_1_ip_block); */ 2067 /* amdgpu_device_ip_block_add(adev, &uvd_v3_1_ip_block); */
2068 /* amdgpu_device_ip_block_add(adev, &vce_v1_0_ip_block); */ 2068 /* amdgpu_device_ip_block_add(adev, &vce_v1_0_ip_block); */
2069 break; 2069 break;
@@ -2071,13 +2071,14 @@ int si_set_ip_blocks(struct amdgpu_device *adev)
2071 amdgpu_device_ip_block_add(adev, &si_common_ip_block); 2071 amdgpu_device_ip_block_add(adev, &si_common_ip_block);
2072 amdgpu_device_ip_block_add(adev, &gmc_v6_0_ip_block); 2072 amdgpu_device_ip_block_add(adev, &gmc_v6_0_ip_block);
2073 amdgpu_device_ip_block_add(adev, &si_ih_ip_block); 2073 amdgpu_device_ip_block_add(adev, &si_ih_ip_block);
2074 amdgpu_device_ip_block_add(adev, &gfx_v6_0_ip_block);
2075 amdgpu_device_ip_block_add(adev, &si_dma_ip_block);
2074 amdgpu_device_ip_block_add(adev, &si_smu_ip_block); 2076 amdgpu_device_ip_block_add(adev, &si_smu_ip_block);
2075 if (adev->enable_virtual_display) 2077 if (adev->enable_virtual_display)
2076 amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block); 2078 amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
2077 else 2079 else
2078 amdgpu_device_ip_block_add(adev, &dce_v6_4_ip_block); 2080 amdgpu_device_ip_block_add(adev, &dce_v6_4_ip_block);
2079 amdgpu_device_ip_block_add(adev, &gfx_v6_0_ip_block); 2081
2080 amdgpu_device_ip_block_add(adev, &si_dma_ip_block);
2081 /* amdgpu_device_ip_block_add(adev, &uvd_v3_1_ip_block); */ 2082 /* amdgpu_device_ip_block_add(adev, &uvd_v3_1_ip_block); */
2082 /* amdgpu_device_ip_block_add(adev, &vce_v1_0_ip_block); */ 2083 /* amdgpu_device_ip_block_add(adev, &vce_v1_0_ip_block); */
2083 break; 2084 break;
@@ -2085,11 +2086,11 @@ int si_set_ip_blocks(struct amdgpu_device *adev)
2085 amdgpu_device_ip_block_add(adev, &si_common_ip_block); 2086 amdgpu_device_ip_block_add(adev, &si_common_ip_block);
2086 amdgpu_device_ip_block_add(adev, &gmc_v6_0_ip_block); 2087 amdgpu_device_ip_block_add(adev, &gmc_v6_0_ip_block);
2087 amdgpu_device_ip_block_add(adev, &si_ih_ip_block); 2088 amdgpu_device_ip_block_add(adev, &si_ih_ip_block);
2089 amdgpu_device_ip_block_add(adev, &gfx_v6_0_ip_block);
2090 amdgpu_device_ip_block_add(adev, &si_dma_ip_block);
2088 amdgpu_device_ip_block_add(adev, &si_smu_ip_block); 2091 amdgpu_device_ip_block_add(adev, &si_smu_ip_block);
2089 if (adev->enable_virtual_display) 2092 if (adev->enable_virtual_display)
2090 amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block); 2093 amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
2091 amdgpu_device_ip_block_add(adev, &gfx_v6_0_ip_block);
2092 amdgpu_device_ip_block_add(adev, &si_dma_ip_block);
2093 break; 2094 break;
2094 default: 2095 default:
2095 BUG(); 2096 BUG();
generated by cgit v1.2.2 (git 2.25.0) at 2026-01-03 23:12:48 -0500