Commit eb78d83e authored by Leo (Sunpeng) Li's avatar Leo (Sunpeng) Li Committed by Alex Deucher
Browse files

drm/amd/display: Do not release state objects on atomic check fail 



In any drm ioctl call, drm_atomic_state_clear() is called at the end to
destroy the states; even if atomic check fails. Therefore, releasing
states on atomic check failure is incorrect.

Signed-off-by: default avatarLeo (Sunpeng) Li <sunpeng.li@amd.com>
Reviewed-by: default avatarAndrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4bdbab3e

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

+6 −15
Original line number Diff line number Diff line
@@ -2989,7 +2989,7 @@ int amdgpu_dm_atomic_check(struct drm_device *dev, 
				conn_state = drm_atomic_get_connector_state(state, &aconnector->base);

				if (IS_ERR(conn_state)) {

					ret = PTR_ERR_OR_ZERO(conn_state);

					goto fail_crtcs;

					goto fail;

				}



				dm_conn_state = to_dm_connector_state(conn_state);
@@ -3048,7 +3048,7 @@ int amdgpu_dm_atomic_check(struct drm_device *dev, 


			ret = drm_atomic_add_affected_planes(state, crtc);

			if (ret)

				goto fail_crtcs;

				goto fail;

		}

	}
@@ -3110,7 +3110,7 @@ int amdgpu_dm_atomic_check(struct drm_device *dev, 
					crtc_state,

					false);

				if (ret)

					goto fail_planes;

					goto fail;





				if (dm_plane_state->surface)
@@ -3142,13 +3142,12 @@ int amdgpu_dm_atomic_check(struct drm_device *dev, 


		ret = do_aquire_global_lock(dev, state);

		if (ret)

			goto fail_planes;



			goto fail;

		WARN_ON(dm_state->context);

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

		if (!dm_state->context) {

			ret = -EINVAL;

			goto fail_planes;

			goto fail;

		}

	}
@@ -3156,15 +3155,7 @@ int amdgpu_dm_atomic_check(struct drm_device *dev, 
	WARN_ON(ret);

	return ret;



fail_planes:

	for (i = 0; i < set_count; i++)

		for (j = 0; j < set[i].surface_count; j++)

			dc_surface_release(set[i].surfaces[j]);



fail_crtcs:

	for (i = 0; i < set_count; i++)

		dc_stream_release(set[i].stream);



fail:

	if (ret == -EDEADLK)

		DRM_DEBUG_KMS("Atomic check stopped due to to deadlock.\n");

	else if (ret == -EINTR || ret == -EAGAIN || ret == -ERESTARTSYS)