Commit 929c3aaa authored by Eric Bernstein's avatar Eric Bernstein Committed by Alex Deucher

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

Cross a TODO item off the list. Cleanup SIGNAL_TYPE_HDMI_FRL, it's
not currently supported.
Signed-off-by: default avatarEric Bernstein <eric.bernstein@amd.com>
Reviewed-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fbaf207f
...@@ -260,6 +260,7 @@ bool resource_construct( ...@@ -260,6 +260,7 @@ bool resource_construct(
pool->stream_enc_count++; pool->stream_enc_count++;
} }
} }
dc->caps.dynamic_audio = false; dc->caps.dynamic_audio = false;
if (pool->audio_count < pool->stream_enc_count) { if (pool->audio_count < pool->stream_enc_count) {
dc->caps.dynamic_audio = true; dc->caps.dynamic_audio = true;
......
...@@ -874,10 +874,7 @@ static void destruct(struct dcn10_resource_pool *pool) ...@@ -874,10 +874,7 @@ static void destruct(struct dcn10_resource_pool *pool)
for (i = 0; i < pool->base.stream_enc_count; i++) { for (i = 0; i < pool->base.stream_enc_count; i++) {
if (pool->base.stream_enc[i] != NULL) { if (pool->base.stream_enc[i] != NULL) {
/* TODO: free dcn version of stream encoder once implemented kfree(DCN10STRENC_FROM_STRENC(pool->base.stream_enc[i]));
* rather than using virtual stream encoder
*/
kfree(pool->base.stream_enc[i]);
pool->base.stream_enc[i] = NULL; pool->base.stream_enc[i] = NULL;
} }
} }
...@@ -930,9 +927,6 @@ static void destruct(struct dcn10_resource_pool *pool) ...@@ -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++) { for (i = 0; i < pool->base.audio_count; i++) {
if (pool->base.audios[i]) if (pool->base.audios[i])
dce_aud_destroy(&pool->base.audios[i]); dce_aud_destroy(&pool->base.audios[i]);
......
...@@ -154,6 +154,7 @@ struct resource_pool { ...@@ -154,6 +154,7 @@ struct resource_pool {
unsigned int pipe_count; unsigned int pipe_count;
unsigned int underlay_pipe_index; unsigned int underlay_pipe_index;
unsigned int stream_enc_count; unsigned int stream_enc_count;
unsigned int ref_clock_inKhz; unsigned int ref_clock_inKhz;
unsigned int timing_generator_count; unsigned int timing_generator_count;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment