diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c
index c77f35bcacaca0cd57209a73ca7e0a4ab4f8d08e..f2a87cd3507b522242b8da8469ba8f2a0b35d2eb 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c
@@ -2981,7 +2981,6 @@ int amdgpu_dm_atomic_check(struct drm_device *dev,
 	struct amdgpu_device *adev = dev->dev_private;
 	struct dc *dc = adev->dm.dc;
 	bool need_to_validate = false;
-	struct validate_context *context;
 	struct drm_connector *connector;
 	struct drm_connector_state *conn_state;
 	/*
@@ -3216,10 +3215,9 @@ int amdgpu_dm_atomic_check(struct drm_device *dev,
 		}
 	}
 
-	context = dc_get_validate_context(dc, dm_state->set, dm_state->set_count);
-
-	if (need_to_validate == false || dm_state->set_count == 0 || context) {
+	dm_state->context = dc_get_validate_context(dc, dm_state->set, dm_state->set_count);
 
+	if (need_to_validate == false || dm_state->set_count == 0 || dm_state->context) {
 		ret = 0;
 		/*
 		 * For full updates case when
@@ -3235,18 +3233,6 @@ int amdgpu_dm_atomic_check(struct drm_device *dev,
 
 	}
 
-	if (context) {
-		dc_resource_validate_ctx_destruct(context);
-		dm_free(context);
-	}
-
-	for (i = 0; i < dm_state->set_count; i++)
-		for (j = 0; j < dm_state->set[i].surface_count; j++)
-			dc_surface_release(dm_state->set[i].surfaces[j]);
-
-	for (i = 0; i < new_stream_count; i++)
-		dc_stream_release(new_streams[i]);
-
 	if (ret != 0) {
 		if (ret == -EDEADLK)
 			DRM_DEBUG_KMS("Atomic check stopped due to to deadlock.\n");
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.h
index a7adf8dbd067b1696976d96e30a619ef35e8118b..1e444cb5123df616b5e1f93a84026e80efbf9474 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.h
@@ -55,7 +55,7 @@ struct dm_atomic_state {
 
 	struct dc_validation_set set[MAX_STREAMS];
 	int set_count;
-
+	struct validate_context *context;
 };
 
 #define to_dm_atomic_state(x) container_of(x, struct dm_atomic_state, base)