Commit 0a323b84 authored by Andrey Grodzovsky's avatar Andrey Grodzovsky Committed by Alex Deucher
Browse files

drm/amd/display: Release dm_state->context when state is cleared. 



Handling a use case of TEST_ONLY request from DRM where commit is
not goiing to be called. We need to release the allocated dc_validate_context
in this case.

Signed-off-by: default avatarAndrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3b42a1c0

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

+23 −0
Original line number Diff line number Diff line
@@ -653,12 +653,35 @@ dm_atomic_state_alloc(struct drm_device *dev) 
	return &state->base;

}



static void

dm_atomic_state_clear(struct drm_atomic_state *state)

{

	struct dm_atomic_state *dm_state = to_dm_atomic_state(state);



	if (dm_state->context) {

		dc_release_validate_context(dm_state->context);

		dm_state->context = NULL;

	}



	drm_atomic_state_default_clear(state);

}



static void

dm_atomic_state_alloc_free(struct drm_atomic_state *state)

{

	struct dm_atomic_state *dm_state = to_dm_atomic_state(state);

	drm_atomic_state_default_release(state);

	kfree(dm_state);

}



static const struct drm_mode_config_funcs amdgpu_dm_mode_funcs = {

	.fb_create = amdgpu_user_framebuffer_create,

	.output_poll_changed = amdgpu_output_poll_changed,

	.atomic_check = amdgpu_dm_atomic_check,

	.atomic_commit = amdgpu_dm_atomic_commit,

	.atomic_state_alloc = dm_atomic_state_alloc,

	.atomic_state_clear = dm_atomic_state_clear,

	.atomic_state_free = dm_atomic_state_alloc_free

};



static struct drm_mode_config_helper_funcs amdgpu_dm_mode_config_helperfuncs = {

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

+1 −0
Original line number Diff line number Diff line
@@ -3144,6 +3144,7 @@ int amdgpu_dm_atomic_check(struct drm_device *dev, 
		if (ret)

			goto fail_planes;



		WARN_ON(dm_state->context);

		dm_state->context = dc_get_validate_context(dc, set, set_count);

		if (!dm_state->context) {

			ret = -EINVAL;