diff options
| author | Wenjing Liu <[email protected]> | 2017-08-22 22:42:51 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2017-09-26 22:17:04 +0000 |
| commit | 0f0bdca5cae04ec2f842955bcef16a3daed6149f (patch) | |
| tree | 4a55fd1008193ef4c948c9aa0905741a5aa89df4 /drivers/gpu/drm/amd/display | |
| parent | drm/amd/display: Fix return value from rx irq handler on up request (diff) | |
| download | kernel-0f0bdca5cae04ec2f842955bcef16a3daed6149f.tar.gz kernel-0f0bdca5cae04ec2f842955bcef16a3daed6149f.zip | |
drm/amd/display: Safe stream encoder id in stream_status
Signed-off-by: Wenjing Liu <[email protected]>
Reviewed-by: Tony Cheng <[email protected]>
Acked-by: Harry Wentland <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/display')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dc.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c index 428863bccab6..fbfe15f783c0 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -1599,6 +1599,7 @@ enum dc_status resource_map_pool_resources( for (i = 0; i < context->stream_count; i++) if (context->streams[i] == stream) { context->stream_status[i].primary_otg_inst = pipe_ctx->stream_res.tg->inst; + context->stream_status[i].stream_enc_inst = pipe_ctx->stream_res.stream_enc->id; return DC_OK; } diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h index 0f2a16a0cf82..9cc1c28caa4e 100644 --- a/drivers/gpu/drm/amd/display/dc/dc.h +++ b/drivers/gpu/drm/amd/display/dc/dc.h @@ -510,6 +510,7 @@ enum surface_update_type { struct dc_stream_status { int primary_otg_inst; + int stream_enc_inst; int plane_count; struct dc_plane_state *plane_states[MAX_SURFACE_NUM]; |