UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Leo (Sunpeng) Li <sunpeng.li@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Leo (Sunpeng) Li 2018-01-03 13:04:21 -05:00 committed by Alex Deucher
parent ff1374c94b
commit d1bd7d61bc
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
View File

@ -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)

34
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c
View File

@ -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,22 +61,25 @@ 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,
stream_state,
true, true);
if (dc_stream_configure_crc(stream_state->ctx->dc,
stream_state,
true, true))
crtc_state->crc_enabled = true;
else
return -EINVAL;
} else {
ret = dc_stream_configure_crc(stream_state->ctx->dc,
stream_state,
false, false);
if (dc_stream_configure_crc(stream_state->ctx->dc,
stream_state,
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;
*values_cnt = 3;
/* Reset crc_skipped flag on dm state */
crtc_state->crc_first_skipped = false;
return 0;
}
/**
@ -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.