]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
drm/amd/display: Fix to be able to stop crc calculation
authorWayne Lin <Wayne.Lin@amd.com>
Tue, 24 Nov 2020 11:57:03 +0000 (19:57 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 15 Dec 2020 16:33:55 +0000 (11:33 -0500)
[Why]
Find out when we try to disable CRC calculation,
crc generation is still enabled. Main reason is
that dc_stream_configure_crc() will never get
called when the source is AMDGPU_DM_PIPE_CRC_SOURCE_NONE.

[How]
Add checking condition that when source is
AMDGPU_DM_PIPE_CRC_SOURCE_NONE, we should also call
dc_stream_configure_crc() to disable crc calculation.
Also, clean up crc window when disable crc calculation.

Signed-off-by: Wayne Lin <Wayne.Lin@amd.com>
Reviewed-by: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c

index ff6db26626ea5481dad8a46b8fb6cd220a95b44c..7b886a779a8cabe94b9b48272869630c2fd9f42e 100644 (file)
@@ -81,6 +81,14 @@ const char *const *amdgpu_dm_crtc_get_crc_sources(struct drm_crtc *crtc,
        return pipe_crc_sources;
 }
 
+static void amdgpu_dm_set_crc_window_default(struct dm_crtc_state *dm_crtc_state)
+{
+       dm_crtc_state->crc_window.x_start = 0;
+       dm_crtc_state->crc_window.y_start = 0;
+       dm_crtc_state->crc_window.x_end = 0;
+       dm_crtc_state->crc_window.y_end = 0;
+}
+
 bool amdgpu_dm_crc_window_is_default(struct dm_crtc_state *dm_crtc_state)
 {
        bool ret = true;
@@ -141,7 +149,10 @@ int amdgpu_dm_crtc_configure_crc_source(struct drm_crtc *crtc,
        mutex_lock(&adev->dm.dc_lock);
 
        /* Enable CRTC CRC generation if necessary. */
-       if (dm_is_crc_source_crtc(source)) {
+       if (dm_is_crc_source_crtc(source) || source == AMDGPU_DM_PIPE_CRC_SOURCE_NONE) {
+               if (!enable)
+                       amdgpu_dm_set_crc_window_default(dm_crtc_state);
+
                if (!amdgpu_dm_crc_window_is_default(dm_crtc_state)) {
                        crc_window = &tmp_window;