* [PATCH 1/2] drm/qxl: drop redundant code
[not found] <20210511104522.2694803-1-kraxel@redhat.com>
@ 2021-05-11 10:45 ` Gerd Hoffmann
2021-05-11 10:45 ` [PATCH 2/2] drm/qxl: balance dumb_shadow_bo pin Gerd Hoffmann
1 sibling, 0 replies; 2+ messages in thread
From: Gerd Hoffmann @ 2021-05-11 10:45 UTC (permalink / raw)
To: dri-devel
Cc: Gerd Hoffmann, Dave Airlie, David Airlie, Daniel Vetter,
open list:DRM DRIVER FOR QXL VIRTUAL GPU,
open list:DRM DRIVER FOR QXL VIRTUAL GPU, open list
Not needed, qxl_io_destroy_primary() does that for us.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
drivers/gpu/drm/qxl/qxl_display.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index a7637e79cb42..be5183733c1b 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -677,10 +677,8 @@ static void qxl_primary_atomic_disable(struct drm_plane *plane,
if (bo->shadow)
bo = bo->shadow;
- if (bo->is_primary) {
+ if (bo->is_primary)
qxl_io_destroy_primary(qdev);
- bo->is_primary = false;
- }
}
}
--
2.31.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH 2/2] drm/qxl: balance dumb_shadow_bo pin
[not found] <20210511104522.2694803-1-kraxel@redhat.com>
2021-05-11 10:45 ` [PATCH 1/2] drm/qxl: drop redundant code Gerd Hoffmann
@ 2021-05-11 10:45 ` Gerd Hoffmann
1 sibling, 0 replies; 2+ messages in thread
From: Gerd Hoffmann @ 2021-05-11 10:45 UTC (permalink / raw)
To: dri-devel
Cc: Gerd Hoffmann, Dave Airlie, David Airlie, Daniel Vetter,
open list:DRM DRIVER FOR QXL VIRTUAL GPU,
open list:DRM DRIVER FOR QXL VIRTUAL GPU, open list
The shadow bo is created in pinned state, so we have to unpin it when
dropping the reference. Otherwise ttm is unhappy and throws a WARN()
on release.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
drivers/gpu/drm/qxl/qxl_display.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index be5183733c1b..9e0a1e836011 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -801,6 +801,7 @@ static void qxl_prepare_shadow(struct qxl_device *qdev, struct qxl_bo *user_bo,
qdev->dumb_shadow_bo->surf.width != surf.width ||
qdev->dumb_shadow_bo->surf.height != surf.height) {
if (qdev->dumb_shadow_bo) {
+ qxl_bo_unpin(qdev->dumb_shadow_bo);
drm_gem_object_put
(&qdev->dumb_shadow_bo->tbo.base);
qdev->dumb_shadow_bo = NULL;
--
2.31.1
^ permalink raw reply related [flat|nested] 2+ messages in thread