mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
drm/amd/display: dc_validate_ctx refocunt fixes.
In dc_resource_validate_ctx_copy_construct don't override dst context refcount. Remove extra retain to new ctx in dc_update_surfaces_and_stream Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com> Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> Acked-by: Harry Wentland <Harry.Wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
189f73e32e
commit
9a3afbb3ea
2 changed files with 6 additions and 4 deletions
|
@ -424,6 +424,7 @@ static void allocate_dc_stream_funcs(struct core_dc *core_dc)
|
|||
static void destruct(struct core_dc *dc)
|
||||
{
|
||||
dc_release_validate_context(dc->current_context);
|
||||
dc->current_context = NULL;
|
||||
|
||||
destroy_links(dc);
|
||||
|
||||
|
@ -441,9 +442,6 @@ static void destruct(struct core_dc *dc)
|
|||
if (dc->ctx->logger)
|
||||
dal_logger_destroy(&dc->ctx->logger);
|
||||
|
||||
dm_free(dc->current_context);
|
||||
dc->current_context = NULL;
|
||||
|
||||
dm_free(dc->ctx);
|
||||
dc->ctx = NULL;
|
||||
}
|
||||
|
@ -1656,7 +1654,6 @@ void dc_update_surfaces_and_stream(struct dc *dc,
|
|||
|
||||
if (core_dc->current_context != context) {
|
||||
dc_release_validate_context(core_dc->current_context);
|
||||
dc_retain_validate_context(context);
|
||||
core_dc->current_context = context;
|
||||
}
|
||||
return;
|
||||
|
|
|
@ -2166,6 +2166,7 @@ void dc_resource_validate_ctx_copy_construct(
|
|||
struct validate_context *dst_ctx)
|
||||
{
|
||||
int i, j;
|
||||
int ref_count = dst_ctx->ref_count;
|
||||
|
||||
*dst_ctx = *src_ctx;
|
||||
|
||||
|
@ -2186,6 +2187,10 @@ void dc_resource_validate_ctx_copy_construct(
|
|||
dc_surface_retain(
|
||||
dst_ctx->stream_status[i].surfaces[j]);
|
||||
}
|
||||
|
||||
/* context refcount should not be overridden */
|
||||
dst_ctx->ref_count = ref_count;
|
||||
|
||||
}
|
||||
|
||||
struct clock_source *dc_resource_find_first_free_pll(
|
||||
|
|
Loading…
Add table
Reference in a new issue