mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-28 21:33:52 +00:00
Code Issues Releases Wiki Activity

drm/amd/display: Free DCN version of stream encoder

Browse source 
Cross a TODO item off the list. Cleanup SIGNAL_TYPE_HDMI_FRL, it's
not currently supported.

Signed-off-by: Eric Bernstein <eric.bernstein@amd.com>
Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Eric Bernstein 2019-02-13 17:56:38 -05:00 committed by Alex Deucher
parent fbaf207f58
commit 929c3aaa26
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/gpu/drm/amd/display/dc/core/dc_resource.c
View file

@ -260,6 +260,7 @@ bool resource_construct(
pool->stream_enc_count++;
}
}
dc->caps.dynamic_audio = false;
if (pool->audio_count < pool->stream_enc_count) {
dc->caps.dynamic_audio = true;

8
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
View file

@ -874,10 +874,7 @@ static void destruct(struct dcn10_resource_pool *pool)
for (i = 0; i < pool->base.stream_enc_count; i++) {
if (pool->base.stream_enc[i] != NULL) {
/* TODO: free dcn version of stream encoder once implemented
* rather than using virtual stream encoder
*/
kfree(pool->base.stream_enc[i]);
kfree(DCN10STRENC_FROM_STRENC(pool->base.stream_enc[i]));
pool->base.stream_enc[i] = NULL;
}
}
@ -930,9 +927,6 @@ static void destruct(struct dcn10_resource_pool *pool)
}
}
for (i = 0; i < pool->base.stream_enc_count; i++)
kfree(pool->base.stream_enc[i]);
for (i = 0; i < pool->base.audio_count; i++) {
if (pool->base.audios[i])
dce_aud_destroy(&pool->base.audios[i]);

1
drivers/gpu/drm/amd/display/dc/inc/core_types.h
View file

@ -154,6 +154,7 @@ struct resource_pool {
unsigned int pipe_count;
unsigned int underlay_pipe_index;
unsigned int stream_enc_count;
unsigned int ref_clock_inKhz;
unsigned int timing_generator_count;