hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/gpu/drm/amd/amdgpu/df_v1_7.c
....@@ -29,7 +29,14 @@
2929
3030 static u32 df_v1_7_channel_number[] = {1, 2, 0, 4, 0, 8, 0, 16, 2};
3131
32
-static void df_v1_7_init (struct amdgpu_device *adev)
32
+static void df_v1_7_sw_init(struct amdgpu_device *adev)
33
+{
34
+ adev->df.hash_status.hash_64k = false;
35
+ adev->df.hash_status.hash_2m = false;
36
+ adev->df.hash_status.hash_1g = false;
37
+}
38
+
39
+static void df_v1_7_sw_fini(struct amdgpu_device *adev)
3340 {
3441 }
3542
....@@ -62,7 +69,7 @@
6269 {
6370 int fb_channel_number;
6471
65
- fb_channel_number = adev->df_funcs->get_fb_channel_number(adev);
72
+ fb_channel_number = adev->df.funcs->get_fb_channel_number(adev);
6673
6774 return df_v1_7_channel_number[fb_channel_number];
6875 }
....@@ -73,7 +80,7 @@
7380 u32 tmp;
7481
7582 /* Put DF on broadcast mode */
76
- adev->df_funcs->enable_broadcast_mode(adev, true);
83
+ adev->df.funcs->enable_broadcast_mode(adev, true);
7784
7885 if (enable && (adev->cg_flags & AMD_CG_SUPPORT_DF_MGCG)) {
7986 tmp = RREG32_SOC15(DF, 0, mmDF_PIE_AON0_DfGlobalClkGater);
....@@ -88,7 +95,7 @@
8895 }
8996
9097 /* Exit boradcast mode */
91
- adev->df_funcs->enable_broadcast_mode(adev, false);
98
+ adev->df.funcs->enable_broadcast_mode(adev, false);
9299 }
93100
94101 static void df_v1_7_get_clockgating_state(struct amdgpu_device *adev,
....@@ -110,7 +117,8 @@
110117 }
111118
112119 const struct amdgpu_df_funcs df_v1_7_funcs = {
113
- .init = df_v1_7_init,
120
+ .sw_init = df_v1_7_sw_init,
121
+ .sw_fini = df_v1_7_sw_fini,
114122 .enable_broadcast_mode = df_v1_7_enable_broadcast_mode,
115123 .get_fb_channel_number = df_v1_7_get_fb_channel_number,
116124 .get_hbm_channel_number = df_v1_7_get_hbm_channel_number,