Commit 6df0768c authored by Timur Kristóf's avatar Timur Kristóf Committed by Alex Deucher
Browse files

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: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarTimur Kristóf <timur.kristof@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7009e3af

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

+0 −2
Original line number Diff line number Diff line
@@ -496,8 +496,6 @@ struct amdgpu_crtc { 
	struct drm_connector *connector;

	/* for dpm */

	u32 line_time;

	u32 wm_low;

	u32 wm_high;

	u32 lb_vblank_lead_lines;

	struct drm_display_mode hw_mode;

	/* for virtual dce */

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

+1 −2
Original line number Diff line number Diff line
@@ -1141,8 +1141,7 @@ static void dce_v10_0_program_watermarks(struct amdgpu_device *adev, 


	/* save values for DPM */

	amdgpu_crtc->line_time = line_time;

	amdgpu_crtc->wm_high = latency_watermark_a;

	amdgpu_crtc->wm_low = latency_watermark_b;



	/* Save number of lines the linebuffer leads before the scanout */

	amdgpu_crtc->lb_vblank_lead_lines = lb_vblank_lead_lines;

}

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

+1 −2
Original line number Diff line number Diff line
@@ -1173,8 +1173,7 @@ static void dce_v11_0_program_watermarks(struct amdgpu_device *adev, 


	/* save values for DPM */

	amdgpu_crtc->line_time = line_time;

	amdgpu_crtc->wm_high = latency_watermark_a;

	amdgpu_crtc->wm_low = latency_watermark_b;



	/* Save number of lines the linebuffer leads before the scanout */

	amdgpu_crtc->lb_vblank_lead_lines = lb_vblank_lead_lines;

}

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

+0 −1
Original line number Diff line number Diff line
@@ -1034,7 +1034,6 @@ static void dce_v6_0_program_watermarks(struct amdgpu_device *adev, 


	/* save values for DPM */

	amdgpu_crtc->line_time = line_time;

	amdgpu_crtc->wm_high = latency_watermark_a;



	/* Save number of lines the linebuffer leads before the scanout */

	amdgpu_crtc->lb_vblank_lead_lines = lb_vblank_lead_lines;

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

+1 −2
Original line number Diff line number Diff line
@@ -1096,8 +1096,7 @@ static void dce_v8_0_program_watermarks(struct amdgpu_device *adev, 


	/* save values for DPM */

	amdgpu_crtc->line_time = line_time;

	amdgpu_crtc->wm_high = latency_watermark_a;

	amdgpu_crtc->wm_low = latency_watermark_b;



	/* Save number of lines the linebuffer leads before the scanout */

	amdgpu_crtc->lb_vblank_lead_lines = lb_vblank_lead_lines;

}