From 64854802bc219ea0521df99144c24ceaaba09d5e Mon Sep 17 00:00:00 2001 From: David Rokhvarg Date: Wed, 6 Jan 2016 15:49:08 -0500 Subject: [PATCH 1234/1565] drm/amd/dal: Balance dc surface reference count. This resolves memory leak because of double increment of surface reference count in dc_commit_surfaces_to_target(). Change-Id: I03b940a98f97cb9f56ce49fc0662c3edb82f8f40 Signed-off-by: David Rokhvarg Acked-by: Jordan Lazare --- drivers/gpu/drm/amd/dal/dc/core/dc_resource.c | 5 +++-- drivers/gpu/drm/amd/dal/dc/core/dc_target.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/dal/dc/core/dc_resource.c b/drivers/gpu/drm/amd/dal/dc/core/dc_resource.c index ab081c1..1ad317a 100644 --- a/drivers/gpu/drm/amd/dal/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/dal/dc/core/dc_resource.c @@ -388,8 +388,9 @@ bool logical_attach_surfaces_to_target( uint8_t i; struct core_target *target = DC_TARGET_TO_CORE(dc_target); - if (target->status.surface_count >= MAX_SURFACE_NUM) { - dal_error("Surface: this target has too many surfaces!\n"); + if (surface_count > MAX_SURFACE_NUM) { + dal_error("Surface: can not attach %d surfaces! Maximum is: %d\n", + surface_count, MAX_SURFACE_NUM); return false; } diff --git a/drivers/gpu/drm/amd/dal/dc/core/dc_target.c b/drivers/gpu/drm/amd/dal/dc/core/dc_target.c index 433f712..31374ab 100644 --- a/drivers/gpu/drm/amd/dal/dc/core/dc_target.c +++ b/drivers/gpu/drm/amd/dal/dc/core/dc_target.c @@ -259,7 +259,6 @@ bool dc_commit_surfaces_to_target( LOG_MINOR_COMPONENT_DC, "0x%x:", surface); - dc_surface_retain(surface); program_gamma(dc->ctx, surface, DC_STREAM_TO_CORE(target->public.streams[0])->ipp, @@ -271,6 +270,7 @@ bool dc_commit_surfaces_to_target( dc->hwss.update_plane_address(core_surface, target); } + if (current_enabled_surface_count == 0 && new_enabled_surface_count > 0) dc_target_enable_memory_requests(dc_target); -- 1.9.1