From: Yongqiang Sun <yongqiang.sun@xxxxxxx>
Change-Id: I9a5c699fd9b17c15ea2903d6a1b13c47209f8311
Signed-off-by: Yongqiang Sun <yongqiang.sun at amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng at amd.com>
Acked-by: Harry Wentland <Harry.Wentland at amd.com>
---
drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 4 +++-
drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 8 ++++++--
2 files changed, 9 insertions(+), 3 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 237436e22720..84e3fbbe23ac 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
@@ -89,9 +89,11 @@ static bool construct(struct core_stream *stream,
static void destruct(struct core_stream *stream)
{
dc_sink_release(&stream->sink->public);
- if (stream->public.out_transfer_func != NULL)
+ if (stream->public.out_transfer_func != NULL) {
dc_transfer_func_release(
stream->public.out_transfer_func);
+ stream->public.out_transfer_func = NULL;
+ }
}
void dc_stream_retain(const struct dc_stream *dc_stream)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_surface.c b/drivers/gpu/drm/amd/display/dc/core/dc_surface.c
index 3ec1f363e43e..cf8fb9a8ce8e 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_surface.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_surface.c
@@ -71,11 +71,15 @@ static bool construct(struct dc_context *ctx, struct surface *surface)
static void destruct(struct surface *surface)
{
- if (surface->protected.public.gamma_correction != NULL)
+ if (surface->protected.public.gamma_correction != NULL) {
dc_gamma_release(surface->protected.public.gamma_correction);
- if (surface->protected.public.in_transfer_func != NULL)
+ surface->protected.public.gamma_correction = NULL;
+ }
+ if (surface->protected.public.in_transfer_func != NULL) {
dc_transfer_func_release(
surface->protected.public.in_transfer_func);
+ surface->protected.public.in_transfer_func = NULL;
+ }
}
/*******************************************************************************
--
2.9.3
