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>

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 a99196414255d71d1f4fb6de164858ff9817f623..23df7bc020d2a60a47cbdfffc6be3d7007039a77 100644 (file)
--- 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 1adfa97bf3fd3f0eb65fce333b466989d76138e6..97f6f34f3d22df105ec1380549f38d2efcaa6d46 100644 (file)
--- 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 {