On 2019-01-28 9:00 a.m., Nicholas Kazlauskas wrote:
> [Why]
> The flip and full structures were allocated but never freed.
>
> [How]
> Free them at the end of the function. There's a small behavioral
> change here with the function returning early if the allocation fails
> but we wouldn't should be doing anything in that case anyway.
>
> Fixes: c00e0cc0fdc0 ("drm/amd/display: Call into DC once per multiplane flip")
> Fixes: ea39594e0855 ("drm/amd/display: Perform plane updates only when
> needed")
>
> Cc: Michel Dänzer <mic...@daenzer.net>
> Cc: Leo Li <sunpeng...@amd.com>
> Cc: Harry Wentland <harry.wentl...@amd.com>
> Signed-off-by: Nicholas Kazlauskas <nicholas.kazlaus...@amd.com>
Reviewed-by: Harry Wentland <harry.wentl...@amd.com>
Harry
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index e551183784fb..78c89da47a33 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -4760,8 +4760,10 @@ static void amdgpu_dm_commit_planes(struct
> drm_atomic_state *state,
> flip = kzalloc(sizeof(*flip), GFP_KERNEL);
> full = kzalloc(sizeof(*full), GFP_KERNEL);
>
> - if (!flip || !full)
> + if (!flip || !full) {
> dm_error("Failed to allocate update bundles\n");
> + goto cleanup;
> + }
>
> /* update planes when needed */
> for_each_oldnew_plane_in_state(state, plane, old_plane_state,
> new_plane_state, i) {
> @@ -4985,6 +4987,10 @@ static void amdgpu_dm_commit_planes(struct
> drm_atomic_state *state,
> dc_state);
> mutex_unlock(&dm->dc_lock);
> }
> +
> +cleanup:
> + kfree(flip);
> + kfree(full);
> }
>
> /*
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
