Commit 55df908b authored by Rodrigo Siqueira's avatar Rodrigo Siqueira Committed by Alex Deucher
Browse files

Revert "drm/amd/display: Fix unused variable warning" 



This reverts commit f01afd1e.

Cc: Wayne Lin <Wayne.Lin@amd.com>
Cc: Alexander Deucher <Alexander.Deucher@amd.com>
Cc: Harry Wentland <Harry.Wentland@amd.com>
Cc: Roman Li <Roman.Li@amd.com>
Cc: Bindu R <Bindu.R@amd.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4369376b

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+3 −1
Original line number Diff line number Diff line
@@ -8378,7 +8378,8 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) 
			acrtc->dm_irq_params.stream = dm_new_crtc_state->stream;

			manage_dm_interrupts(adev, acrtc, true);

		}

		if (IS_ENABLED(CONFIG_DEBUG_FS) && new_crtc_state->active &&

#ifdef CONFIG_DEBUG_FS

		if (new_crtc_state->active &&

			amdgpu_dm_is_valid_crc_source(dm_new_crtc_state->crc_src)) {

			/**

			 * Frontend may have changed so reapply the CRC capture
@@ -8399,6 +8400,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) 
				amdgpu_dm_crtc_configure_crc_source(

					crtc, dm_new_crtc_state, dm_new_crtc_state->crc_src);

		}

#endif

	}



	for_each_new_crtc_in_state(state, crtc, new_crtc_state, j)

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h

+1 −1
Original line number Diff line number Diff line
@@ -46,13 +46,13 @@ static inline bool amdgpu_dm_is_valid_crc_source(enum amdgpu_dm_pipe_crc_source 
}



/* amdgpu_dm_crc.c */

#ifdef CONFIG_DEBUG_FS

bool amdgpu_dm_crc_window_is_default(struct dm_crtc_state *dm_crtc_state);

bool amdgpu_dm_crc_window_changed(struct dm_crtc_state *dm_new_crtc_state,

					struct dm_crtc_state *dm_old_crtc_state);

int amdgpu_dm_crtc_configure_crc_source(struct drm_crtc *crtc,

					struct dm_crtc_state *dm_crtc_state,

					enum amdgpu_dm_pipe_crc_source source);

#ifdef CONFIG_DEBUG_FS

int amdgpu_dm_crtc_set_crc_source(struct drm_crtc *crtc, const char *src_name);

int amdgpu_dm_crtc_verify_crc_source(struct drm_crtc *crtc,

				     const char *src_name,