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

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
...@@ -2989,7 +2989,7 @@ int amdgpu_dm_atomic_check(struct drm_device *dev, ...@@ -2989,7 +2989,7 @@ int amdgpu_dm_atomic_check(struct drm_device *dev,
conn_state = drm_atomic_get_connector_state(state, &aconnector->base); conn_state = drm_atomic_get_connector_state(state, &aconnector->base);
if (IS_ERR(conn_state)) { if (IS_ERR(conn_state)) {
ret = PTR_ERR_OR_ZERO(conn_state); ret = PTR_ERR_OR_ZERO(conn_state);
goto fail_crtcs; goto fail;
} }
dm_conn_state = to_dm_connector_state(conn_state); dm_conn_state = to_dm_connector_state(conn_state);
...@@ -3048,7 +3048,7 @@ int amdgpu_dm_atomic_check(struct drm_device *dev, ...@@ -3048,7 +3048,7 @@ int amdgpu_dm_atomic_check(struct drm_device *dev,
ret = drm_atomic_add_affected_planes(state, crtc); ret = drm_atomic_add_affected_planes(state, crtc);
if (ret) if (ret)
goto fail_crtcs; goto fail;
} }
} }
...@@ -3110,7 +3110,7 @@ int amdgpu_dm_atomic_check(struct drm_device *dev, ...@@ -3110,7 +3110,7 @@ int amdgpu_dm_atomic_check(struct drm_device *dev,
crtc_state, crtc_state,
false); false);
if (ret) if (ret)
goto fail_planes; goto fail;
if (dm_plane_state->surface) if (dm_plane_state->surface)
...@@ -3142,13 +3142,12 @@ int amdgpu_dm_atomic_check(struct drm_device *dev, ...@@ -3142,13 +3142,12 @@ int amdgpu_dm_atomic_check(struct drm_device *dev,
ret = do_aquire_global_lock(dev, state); ret = do_aquire_global_lock(dev, state);
if (ret) if (ret)
goto fail_planes; goto fail;
WARN_ON(dm_state->context); WARN_ON(dm_state->context);
dm_state->context = dc_get_validate_context(dc, set, set_count); dm_state->context = dc_get_validate_context(dc, set, set_count);
if (!dm_state->context) { if (!dm_state->context) {
ret = -EINVAL; ret = -EINVAL;
goto fail_planes; goto fail;
} }
} }
...@@ -3156,15 +3155,7 @@ int amdgpu_dm_atomic_check(struct drm_device *dev, ...@@ -3156,15 +3155,7 @@ int amdgpu_dm_atomic_check(struct drm_device *dev,
WARN_ON(ret); WARN_ON(ret);
return ret; return ret;
fail_planes: fail:
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);
if (ret == -EDEADLK) if (ret == -EDEADLK)
DRM_DEBUG_KMS("Atomic check stopped due to to deadlock.\n"); DRM_DEBUG_KMS("Atomic check stopped due to to deadlock.\n");
else if (ret == -EINTR || ret == -EAGAIN || ret == -ERESTARTSYS) else if (ret == -EINTR || ret == -EAGAIN || ret == -ERESTARTSYS)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment