|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
From 4bcc0c3835cbcc9f9c175f158e2ee502506b6e02 Mon Sep 17 00:00:00 2001
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
From: Fedora Kernel Team <kernel-team@fedoraproject.org>
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
Date: Thu, 3 Aug 2017 13:53:11 -0500
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
Subject: [PATCH] Back out qxl atomic delay
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
---
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
drivers/gpu/drm/qxl/qxl_display.c | 4 ++--
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
index 4a340ef..058340a 100644
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
--- a/drivers/gpu/drm/qxl/qxl_display.c
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
+++ b/drivers/gpu/drm/qxl/qxl_display.c
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
@@ -575,6 +575,8 @@ static void qxl_cursor_atomic_update(struct drm_plane *plane,
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
if (ret)
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
return;
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
+ cmd = (struct qxl_cursor_cmd *) qxl_release_map(qdev, release);
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
+
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
if (fb != old_state->fb) {
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
obj = to_qxl_framebuffer(fb)->obj;
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
user_bo = gem_to_qxl_bo(obj);
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
@@ -612,7 +614,6 @@ static void qxl_cursor_atomic_update(struct drm_plane *plane,
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
qxl_bo_kunmap(cursor_bo);
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
qxl_bo_kunmap(user_bo);
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
- cmd = (struct qxl_cursor_cmd *) qxl_release_map(qdev, release);
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
cmd->u.set.visible = 1;
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
cmd->u.set.shape = qxl_bo_physical_address(qdev,
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
cursor_bo, 0);
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
@@ -623,7 +624,6 @@ static void qxl_cursor_atomic_update(struct drm_plane *plane,
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
if (ret)
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
goto out_free_release;
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
- cmd = (struct qxl_cursor_cmd *) qxl_release_map(qdev, release);
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
cmd->type = QXL_CURSOR_MOVE;
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
}
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
--
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
2.13.3
|
|
![](https://seccdn.libravatar.org/avatar/70cc2f818f82d9376966cb929baa882ad4848e1a2dcae81bc5eaf64ed1894721?s=16&d=retro) |
c6ca7ce |
|