Commit d13fbeb7 authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amd/display: Use _free(kfree) for dm_gpureset_commit_state() 



Using a _free(kfree) macro drops the need for a goto statement
as it will be freed when it goes out of scope.

Reviewed-by: default avatarAlex Hung <alex.hung@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarWayne Lin <wayne.lin@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7b3e14ac

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+2 −5
Original line number Diff line number Diff line
@@ -3301,14 +3301,14 @@ static void dm_gpureset_commit_state(struct dc_state *dc_state, 
		struct dc_scaling_info scaling_infos[MAX_SURFACES];

		struct dc_flip_addrs flip_addrs[MAX_SURFACES];

		struct dc_stream_update stream_update;

	} *bundle;

	} *bundle __free(kfree);

	int k, m;



	bundle = kzalloc(sizeof(*bundle), GFP_KERNEL);



	if (!bundle) {

		drm_err(dm->ddev, "Failed to allocate update bundle\n");

		goto cleanup;

		return;

	}



	for (k = 0; k < dc_state->stream_count; k++) {
@@ -3328,9 +3328,6 @@ static void dm_gpureset_commit_state(struct dc_state *dc_state, 
					 &bundle->stream_update,

					 bundle->surface_updates);

	}



cleanup:

	kfree(bundle);

}



static int dm_resume(struct amdgpu_ip_block *ip_block)