From: "Leo (Sunpeng) Li" <sunpeng.li@xxxxxxx>
Which removes a lockdep warning for a possible deadlock situation:
While holding the drm event mutex (hard irq safe),
dc_post_update_surfaces_to_stream eventually acquires the atom context
lock, which is hard irq unsafe. We should only be calling it on full
updates anyways.
Also remove a redundant call to dc_post_update_surfaces_to_stream,
dc_commit_updates_for_stream already calls it.
Signed-off-by: Leo (Sunpeng) Li <sunpeng.li at amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland at amd.com>
---
drivers/gpu/drm/amd/display/dc/core/dc.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 80ddccc2570a..9d750fa29a87 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -980,8 +980,6 @@ bool dc_commit_planes_to_stream(
new_plane_count,
dc_stream, stream_update, plane_states, state);
- dc_post_update_surfaces_to_stream(dc);
-
kfree(stream_update);
return true;
}
@@ -1418,7 +1416,8 @@ void dc_commit_updates_for_stream(struct dc *dc,
update_type,
context);
- dc_post_update_surfaces_to_stream(dc);
+ if (update_type >= UPDATE_TYPE_FULL)
+ dc_post_update_surfaces_to_stream(dc);
if (dc->current_state != context) {
--
2.14.1
