Attachment 142558 Details for Bug 106175 – Patch that "fixes" the problem.

[patch] Patch that "fixes" the problem.

async_cursor.patch (text/plain), 2.97 KB, created by Brandon Wright on 2018-11-21 23:53:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brandon Wright

Created: 2018-11-21 23:53:30 UTC

Size: 2.97 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>index c1262f62cd9f..5b7aae0cc345 100644
>--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>@@ -119,6 +119,8 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state);
> static int amdgpu_dm_atomic_check(struct drm_device *dev,
> 				  struct drm_atomic_state *state);
> 
>+static void handle_cursor_update(struct drm_plane *plane,
>+				 struct drm_plane_state *old_plane_state);
> 
> 
> 
>@@ -3423,10 +3425,65 @@ static int dm_plane_atomic_check(struct drm_plane *plane,
> 	return -EINVAL;
> }
> 
>+static int dm_drm_plane_atomic_async_check(struct drm_plane *plane,
>+					   struct drm_plane_state *state)
>+{
>+	struct drm_crtc_state *crtc_state;
>+
>+	if (plane->type != DRM_PLANE_TYPE_CURSOR)
>+		return -EINVAL;
>+
>+	crtc_state = drm_atomic_get_existing_crtc_state(state->state,
>+							state->crtc);
>+	if (WARN_ON(!crtc_state))
>+		return -EINVAL;
>+
>+	/*
>+	 * When crtc is inactive or there is a modeset pending,
>+	 * wait for it to complete in the slowpath
>+	 */
>+	if (!crtc_state->active)
>+		return -EINVAL;
>+
>+	/*
>+	 * If any parameters change that may affect watermarks,
>+	 * take the slowpath. Only changing fb or position should be
>+	 * in the fastpath.
>+	 */
>+	if (plane->state->crtc != state->crtc ||
>+	    plane->state->src_w != state->src_w ||
>+	    plane->state->src_h != state->src_h ||
>+	    plane->state->crtc_w != state->crtc_w ||
>+	    plane->state->crtc_h != state->crtc_h ||
>+	    !plane->state->fb != !state->fb)
>+		return -EINVAL;
>+
>+	return 0;
>+}
>+
>+static void dm_drm_plane_atomic_async_update(struct drm_plane *plane,
>+					     struct drm_plane_state *new_state)
>+{
>+	struct drm_plane_state old_state;
>+	old_state.fb = plane->state->fb;
>+	old_state.crtc = plane->state->crtc;
>+
>+	plane->state->src_x = new_state->src_x;
>+	plane->state->src_y = new_state->src_y;
>+	plane->state->crtc_x = new_state->crtc_x;
>+	plane->state->crtc_y = new_state->crtc_y;
>+	plane->state->fb = new_state->fb;
>+
>+	handle_cursor_update(plane, &old_state);
>+}
>+
>+
> static const struct drm_plane_helper_funcs dm_plane_helper_funcs = {
> 	.prepare_fb = dm_plane_helper_prepare_fb,
> 	.cleanup_fb = dm_plane_helper_cleanup_fb,
> 	.atomic_check = dm_plane_atomic_check,
>+	.atomic_async_check = dm_drm_plane_atomic_async_check,
>+	.atomic_async_update = dm_drm_plane_atomic_async_update,
> };
> 
> /*
>@@ -5399,9 +5456,14 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
> 	bool lock_and_validation_needed = false;
> 
> 	ret = drm_atomic_helper_check_modeset(dev, state);
>+
> 	if (ret)
> 		goto fail;
> 
>+	if (state->legacy_cursor_update)
>+		state->async_update = !drm_atomic_helper_async_check(dev,
>+								     state);
>+
> 	for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
> 		struct dm_crtc_state *dm_new_crtc_state = to_dm_crtc_state(new_crtc_state);
> 		struct dm_crtc_state *dm_old_crtc_state  = to_dm_crtc_state(old_crtc_state);

Actions: View | Splinter Review

Attachments on bug 106175: 138987 | 138988 | 140858 | 142558 | 142574 | 143080 | 143081

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.