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>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
index 6da4f946cac008ac865cd6d8a06fb0bd84d646d5..20460cfd09bc211b185af7467cf9c2e6ddb07cb0 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
@@ -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 */

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
index ba73518f5cdf36c3f226272ab0d8d138e98fbe5d..72ca6538b2e499aba022f74fd8f77e20cd539921 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@ -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;
 }

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
index b01d88d078fa2bc5adb196c66891f67f7bfa257d..e8460889130003b9fb9a32189d36e0ee7a3fe656 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
@@ -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;
 }

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
index 81760a26f2ffca2d8d4735ef1b8d7c8f4f4978d4..acc887a58518d7dc3d85dd066d00a8711817e964 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
@@ -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;

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
index 19a265bd4d1966b2c845aacbbfa254483607705e..2ccd6aad8dd656caa6679458531ba3b449c11503 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
@@ -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;
 }