diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-10-03 12:39:02 +1000 |
|---|---|---|
| committer | Harry Wentland <harry.wentland@amd.com> | 2017-10-05 17:37:43 -0400 |
| commit | d3e19a12e094d80efeedabb9664ad914d90ed842 (patch) | |
| tree | 143282e9d88d6836036d9636910f8b2621264dee | |
| parent | e3d8a5f41b4c45a24534cc841a9f919de349b768 (diff) | |
amdgpu/dc: use kref for dc_state.amd-staging-dc-drm-next
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>
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc.c | 26 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/inc/core_types.h | 2 |
3 files changed, 16 insertions, 16 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index d8820d6f79c6..f41f15faf019 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -940,25 +940,25 @@ struct dc_state *dc_create_state(void) if (!context) return NULL; - atomic_inc(&context->ref_count); + kref_init(&context->refcount); return context; } void dc_retain_state(struct dc_state *context) { - ASSERT(atomic_read(&context->ref_count) > 0); - atomic_inc(&context->ref_count); + kref_get(&context->refcount); } -void dc_release_state(struct dc_state *context) +static void dc_state_free(struct kref *kref) { - ASSERT(atomic_read(&context->ref_count) > 0); - atomic_dec(&context->ref_count); + struct dc_state *context = container_of(kref, struct dc_state, refcount); + dc_resource_state_destruct(context); + kfree(context); +} - if (atomic_read(&context->ref_count) == 0) { - dc_resource_state_destruct(context); - kfree(context); - } +void dc_release_state(struct dc_state *context) +{ + kref_put(&context->refcount, dc_state_free); } static bool is_surface_in_context( @@ -1520,7 +1520,7 @@ void dc_set_power_state( struct dc *dc, enum dc_acpi_cm_power_state power_state) { - atomic_t ref_count; + struct kref refcount; switch (power_state) { case DC_ACPI_CM_POWER_STATE_D0: @@ -1538,12 +1538,12 @@ void dc_set_power_state( */ /* Preserve refcount */ - ref_count = dc->current_state->ref_count; + refcount = dc->current_state->refcount; dc_resource_state_destruct(dc->current_state); memset(dc->current_state, 0, sizeof(*dc->current_state)); - dc->current_state->ref_count = ref_count; + dc->current_state->refcount = refcount; break; } 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 99a4d19f582d..77b3474a7c9e 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -2432,7 +2432,7 @@ void dc_resource_state_copy_construct( struct dc_state *dst_ctx) { int i, j; - atomic_t ref_count = dst_ctx->ref_count; + struct kref refcount = dst_ctx->refcount; *dst_ctx = *src_ctx; @@ -2455,7 +2455,7 @@ void dc_resource_state_copy_construct( } /* context refcount should not be overridden */ - dst_ctx->ref_count = ref_count; + dst_ctx->refcount = refcount; } diff --git a/drivers/gpu/drm/amd/display/dc/inc/core_types.h b/drivers/gpu/drm/amd/display/dc/inc/core_types.h index c47ce6b9fc6b..ff23f268fe02 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/core_types.h +++ b/drivers/gpu/drm/amd/display/dc/inc/core_types.h @@ -267,7 +267,7 @@ struct dc_state { struct display_clock *dis_clk; - atomic_t ref_count; + struct kref refcount; }; #endif /* _CORE_TYPES_H_ */ |