diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-10-03 12:39:00 +1000 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-10-06 13:09:50 -0400 |
| commit | bfe0feb143151cce76411bb211c3eec0f6cff7ba (patch) | |
| tree | 0c35acf6c99dfdae6e2fe75d5348c60b69fbae84 /drivers/gpu/drm/amd/display | |
| parent | 4d090f0fae08ddaccf8caaf707f386d52b7f7a08 (diff) | |
amdgpu/dc: convert dc_stream_state to kref.
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>
Diffstat (limited to 'drivers/gpu/drm/amd/display')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 22 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dc.h | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c index a99196414255..23df7bc020d2 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c @@ -118,20 +118,21 @@ static void destruct(struct dc_stream_state *stream) void dc_stream_retain(struct dc_stream_state *stream) { - ASSERT(atomic_read(&stream->ref_count) > 0); - atomic_inc(&stream->ref_count); + kref_get(&stream->refcount); +} + +static void dc_stream_free(struct kref *kref) +{ + struct dc_stream_state *stream = container_of(kref, struct dc_stream_state, refcount); + + destruct(stream); + kfree(stream); } void dc_stream_release(struct dc_stream_state *stream) { if (stream != NULL) { - ASSERT(atomic_read(&stream->ref_count) > 0); - atomic_dec(&stream->ref_count); - - if (atomic_read(&stream->ref_count) == 0) { - destruct(stream); - kfree(stream); - } + kref_put(&stream->refcount, dc_stream_free); } } @@ -149,10 +150,9 @@ struct dc_stream_state *dc_create_stream_for_sink( construct(stream, sink); - atomic_inc(&stream->ref_count); + kref_init(&stream->refcount); return stream; - } struct dc_stream_status *dc_stream_get_status( diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h index 1adfa97bf3fd..97f6f34f3d22 100644 --- a/drivers/gpu/drm/amd/display/dc/dc.h +++ b/drivers/gpu/drm/amd/display/dc/dc.h @@ -558,7 +558,7 @@ struct dc_stream_state { struct dc_stream_status status; /* from stream struct */ - atomic_t ref_count; + struct kref refcount; }; struct dc_stream_update { |