Commit d1bd7d61 authored by Leo (Sunpeng) Li's avatar Leo (Sunpeng) Li Committed by Alex Deucher
Browse files

drm/amd/display: Early return on crc get 



If crc is disabled, early return when getting crc's. That way, we avoid
reading extra registers within the pflip high irq.

Signed-off-by: default avatarLeo (Sunpeng) Li <sunpeng.li@amd.com>
Reviewed-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ff1374c9

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

+1 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ struct dm_crtc_state { 
	struct dc_stream_state *stream;



	bool crc_first_skipped;

	bool crc_enabled;

};



#define to_dm_crtc_state(x)    container_of(x, struct dm_crtc_state, base)

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

+20 −14
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ int amdgpu_dm_crtc_set_crc_source(struct drm_crtc *crtc, const char *src_name, 
{

	struct dm_crtc_state *crtc_state = to_dm_crtc_state(crtc->state);

	struct dc_stream_state *stream_state = crtc_state->stream;

	bool ret;



	enum amdgpu_dm_pipe_crc_source source = dm_parse_crc_source(src_name);
@@ -62,23 +61,26 @@ int amdgpu_dm_crtc_set_crc_source(struct drm_crtc *crtc, const char *src_name, 
	}



	if (source == AMDGPU_DM_PIPE_CRC_SOURCE_AUTO) {

		ret = dc_stream_configure_crc(stream_state->ctx->dc,

		if (dc_stream_configure_crc(stream_state->ctx->dc,

					    stream_state,

					      true, true);

					    true, true))

			crtc_state->crc_enabled = true;

		else

			return -EINVAL;

	} else {

		ret = dc_stream_configure_crc(stream_state->ctx->dc,

		if (dc_stream_configure_crc(stream_state->ctx->dc,

					    stream_state,

					      false, false);

					    false, false))

			crtc_state->crc_enabled = false;

		else

			return -EINVAL;

	}



	if (ret) {

	*values_cnt = 3;

	/* Reset crc_skipped flag on dm state */

	crtc_state->crc_first_skipped = false;

	return 0;

}

	return -EINVAL;

}



/**

 * amdgpu_dm_crtc_handle_crc_irq: Report to DRM the CRC on given CRTC.
@@ -93,6 +95,10 @@ void amdgpu_dm_crtc_handle_crc_irq(struct drm_crtc *crtc) 
	struct dc_stream_state *stream_state = crtc_state->stream;

	uint32_t crcs[3];



	/* Early return if CRC capture is not enabled. */

	if (!crtc_state->crc_enabled)

		return;



	/*

	 * Since flipping and crc enablement happen asynchronously, we - more

	 * often than not - will be returning an 'uncooked' crc on first frame.

CRA Git | Maintained and supported by SUSTech CRA and CCSE