Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80c218d5 authored by Nicholas Kazlauskas's avatar Nicholas Kazlauskas Committed by Alex Deucher
Browse files

drm/amd/display: Do cursor updates after stream updates 



[Why]
Cursor updates used to happen after vblank/flip/stream updates before
the stream update refactor. They now happen before stream updates
which means that they're not going to be synced with fb changes
and that they're going to programmed for pipes that we're disabling
within the same commit.

[How]
Move them after stream updates.

Signed-off-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Reviewed-by: default avatarDavid Francis <David.Francis@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6836d239

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

+6 −3
Original line number Diff line number Diff line
@@ -4663,10 +4663,9 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, 
		struct dc_plane_state *dc_plane;

		struct dm_plane_state *dm_new_plane_state = to_dm_plane_state(new_plane_state);



		if (plane->type == DRM_PLANE_TYPE_CURSOR) {

			handle_cursor_update(plane, old_plane_state);

		/* Cursor plane is handled after stream updates */

		if (plane->type == DRM_PLANE_TYPE_CURSOR)

			continue;

		}



		if (!fb || !crtc || pcrtc != crtc)

			continue;
@@ -4866,6 +4865,10 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, 
		mutex_unlock(&dm->dc_lock);

	}



	for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i)

		if (plane->type == DRM_PLANE_TYPE_CURSOR)

			handle_cursor_update(plane, old_plane_state);



cleanup:

	kfree(flip);

	kfree(full);