Message ID | 87inkxvqy4.fsf@dilma.collabora.co.uk (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Thu, 2017-05-18 at 17:40 -0300, Gabriel Krisman Bertazi wrote: > > Mike Galbraith <efault@gmx.de> writes: > > > > > On Mon, 2017-05-08 at 16:48 -0300, Gabriel Krisman Bertazi wrote: > > > > > > > > Thanks for reporting this. Can you confirm the following patch prevents > > > the issue? > > > > Nope, it still gripes. > > Oops... Thanks for checking. The following patch fixes the issue for > me. Can you please test that one? Yup, all better. -Mike
Mike Galbraith <efault@gmx.de> writes: > On Thu, 2017-05-18 at 17:40 -0300, Gabriel Krisman Bertazi wrote: >> > Mike Galbraith <efault@gmx.de> writes: >> >> > >> > On Mon, 2017-05-08 at 16:48 -0300, Gabriel Krisman Bertazi wrote: >> > >> > > >> > > Thanks for reporting this. Can you confirm the following patch prevents >> > > the issue? >> > >> > Nope, it still gripes. >> >> Oops... Thanks for checking. The following patch fixes the issue for >> me. Can you please test that one? > > Yup, all better. Thanks for testing. I resent it to the list with the appropriate subject line to make sure it gets properly reviewed.
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c index 058340a002c2..4a340efd8ba6 100644 --- a/drivers/gpu/drm/qxl/qxl_display.c +++ b/drivers/gpu/drm/qxl/qxl_display.c @@ -575,8 +575,6 @@ static void qxl_cursor_atomic_update(struct drm_plane *plane, if (ret) return; - cmd = (struct qxl_cursor_cmd *) qxl_release_map(qdev, release); - if (fb != old_state->fb) { obj = to_qxl_framebuffer(fb)->obj; user_bo = gem_to_qxl_bo(obj); @@ -614,6 +612,7 @@ static void qxl_cursor_atomic_update(struct drm_plane *plane, qxl_bo_kunmap(cursor_bo); qxl_bo_kunmap(user_bo); + cmd = (struct qxl_cursor_cmd *) qxl_release_map(qdev, release); cmd->u.set.visible = 1; cmd->u.set.shape = qxl_bo_physical_address(qdev, cursor_bo, 0); @@ -624,6 +623,7 @@ static void qxl_cursor_atomic_update(struct drm_plane *plane, if (ret) goto out_free_release; + cmd = (struct qxl_cursor_cmd *) qxl_release_map(qdev, release); cmd->type = QXL_CURSOR_MOVE; }