leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amdgpu/dc: use kref for dc_state.

Browse Source 
I'm not a huge fan of those copying around refcounts bits, might
want to consider alternates, but this should work for now.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Dave Airlie 2017-10-03 12:39:02 +10:00 committed by Alex Deucher
parent cb56aceabd
commit 8ee5702afd
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/gpu/drm/amd/display/dc/core/dc.c
View File

@ -940,25 +940,25 @@ struct dc_state *dc_create_state(void)
if (!context) if (!context)
return NULL; return NULL;
atomic_inc(&context->ref_count); kref_init(&context->refcount);
return context; return context;
} }
void dc_retain_state(struct dc_state *context) void dc_retain_state(struct dc_state *context)
{ {
ASSERT(atomic_read(&context->ref_count) > 0); kref_get(&context->refcount);
atomic_inc(&context->ref_count); }
static void dc_state_free(struct kref *kref)
{
struct dc_state *context = container_of(kref, struct dc_state, refcount);
dc_resource_state_destruct(context);
kfree(context);
} }
void dc_release_state(struct dc_state *context) void dc_release_state(struct dc_state *context)
{ {
ASSERT(atomic_read(&context->ref_count) > 0); kref_put(&context->refcount, dc_state_free);
atomic_dec(&context->ref_count);
if (atomic_read(&context->ref_count) == 0) {
dc_resource_state_destruct(context);
kfree(context);
}
} }
static bool is_surface_in_context( static bool is_surface_in_context(
@ -1520,7 +1520,7 @@ void dc_set_power_state(
struct dc *dc, struct dc *dc,
enum dc_acpi_cm_power_state power_state) enum dc_acpi_cm_power_state power_state)
{ {
atomic_t ref_count; struct kref refcount;
switch (power_state) { switch (power_state) {
case DC_ACPI_CM_POWER_STATE_D0: case DC_ACPI_CM_POWER_STATE_D0:
@ -1538,12 +1538,12 @@ void dc_set_power_state(
*/ */
/* Preserve refcount */ /* Preserve refcount */
ref_count = dc->current_state->ref_count; refcount = dc->current_state->refcount;
dc_resource_state_destruct(dc->current_state); dc_resource_state_destruct(dc->current_state);
memset(dc->current_state, 0, memset(dc->current_state, 0,
sizeof(*dc->current_state)); sizeof(*dc->current_state));
dc->current_state->ref_count = ref_count; dc->current_state->refcount = refcount;
break; break;
} }

4
drivers/gpu/drm/amd/display/dc/core/dc_resource.c
View File

@ -2432,7 +2432,7 @@ void dc_resource_state_copy_construct(
struct dc_state *dst_ctx) struct dc_state *dst_ctx)
{ {
int i, j; int i, j;
atomic_t ref_count = dst_ctx->ref_count; struct kref refcount = dst_ctx->refcount;
*dst_ctx = *src_ctx; *dst_ctx = *src_ctx;
@ -2455,7 +2455,7 @@ void dc_resource_state_copy_construct(
} }
/* context refcount should not be overridden */ /* context refcount should not be overridden */
dst_ctx->ref_count = ref_count; dst_ctx->refcount = refcount;
} }

2
drivers/gpu/drm/amd/display/dc/inc/core_types.h
View File

@ -267,7 +267,7 @@ struct dc_state {
struct display_clock *dis_clk; struct display_clock *dis_clk;
atomic_t ref_count; struct kref refcount;
}; };
#endif /* _CORE_TYPES_H_ */ #endif /* _CORE_TYPES_H_ */