40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
From 05026e6e19b29104ddba4e8979e6c7af17944695 Mon Sep 17 00:00:00 2001
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Fri, 15 Sep 2017 12:46:15 +0200
|
|
Subject: [testing] qxl: fix pinning
|
|
|
|
cleanup_fb() unpins the just activated framebuffer instead of the
|
|
old one. Oops.
|
|
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
---
|
|
drivers/gpu/drm/qxl/qxl_display.c | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
|
|
index 7babdd8f..afc2272 100644
|
|
--- a/drivers/gpu/drm/qxl/qxl_display.c
|
|
+++ b/drivers/gpu/drm/qxl/qxl_display.c
|
|
@@ -705,14 +705,15 @@ static void qxl_plane_cleanup_fb(struct drm_plane *plane,
|
|
struct drm_gem_object *obj;
|
|
struct qxl_bo *user_bo;
|
|
|
|
- if (!plane->state->fb) {
|
|
- /* we never executed prepare_fb, so there's nothing to
|
|
+ if (!old_state->fb) {
|
|
+ /*
|
|
+ * we never executed prepare_fb, so there's nothing to
|
|
* unpin.
|
|
*/
|
|
return;
|
|
}
|
|
|
|
- obj = to_qxl_framebuffer(plane->state->fb)->obj;
|
|
+ obj = to_qxl_framebuffer(old_state->fb)->obj;
|
|
user_bo = gem_to_qxl_bo(obj);
|
|
qxl_bo_unpin(user_bo);
|
|
}
|
|
--
|
|
cgit v0.12
|
|
|