Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amd/pm: Remove wm_low and wm_high fields from amdgpu_crtc (v2)

These fields were only used by si_dpm and are not necessary
anymore. They also may have been incorrect because:
- wm_high was set to the LOW_WATERMARK field of watermark A.
- wm_low was not set on DCE 6 and was always zero.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Timur Kristóf and committed by
Alex Deucher
6df0768c 7009e3af

+3 -9
-2
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
··· 496 496 struct drm_connector *connector; 497 497 /* for dpm */ 498 498 u32 line_time; 499 - u32 wm_low; 500 - u32 wm_high; 501 499 u32 lb_vblank_lead_lines; 502 500 struct drm_display_mode hw_mode; 503 501 /* for virtual dce */
+1 -2
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
··· 1141 1141 1142 1142 /* save values for DPM */ 1143 1143 amdgpu_crtc->line_time = line_time; 1144 - amdgpu_crtc->wm_high = latency_watermark_a; 1145 - amdgpu_crtc->wm_low = latency_watermark_b; 1144 + 1146 1145 /* Save number of lines the linebuffer leads before the scanout */ 1147 1146 amdgpu_crtc->lb_vblank_lead_lines = lb_vblank_lead_lines; 1148 1147 }
+1 -2
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
··· 1173 1173 1174 1174 /* save values for DPM */ 1175 1175 amdgpu_crtc->line_time = line_time; 1176 - amdgpu_crtc->wm_high = latency_watermark_a; 1177 - amdgpu_crtc->wm_low = latency_watermark_b; 1176 + 1178 1177 /* Save number of lines the linebuffer leads before the scanout */ 1179 1178 amdgpu_crtc->lb_vblank_lead_lines = lb_vblank_lead_lines; 1180 1179 }
-1
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
··· 1034 1034 1035 1035 /* save values for DPM */ 1036 1036 amdgpu_crtc->line_time = line_time; 1037 - amdgpu_crtc->wm_high = latency_watermark_a; 1038 1037 1039 1038 /* Save number of lines the linebuffer leads before the scanout */ 1040 1039 amdgpu_crtc->lb_vblank_lead_lines = lb_vblank_lead_lines;
+1 -2
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
··· 1096 1096 1097 1097 /* save values for DPM */ 1098 1098 amdgpu_crtc->line_time = line_time; 1099 - amdgpu_crtc->wm_high = latency_watermark_a; 1100 - amdgpu_crtc->wm_low = latency_watermark_b; 1099 + 1101 1100 /* Save number of lines the linebuffer leads before the scanout */ 1102 1101 amdgpu_crtc->lb_vblank_lead_lines = lb_vblank_lead_lines; 1103 1102 }