Skip to contentSkip to conversation

drm/virtio: Support drm_panic with non-vmapped shmem BO

PATCH In review Ryosuke Yasuoka 3 participants 6 messages Apr 12, 2025 – Apr 16, 2025

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/virtio: Support drm_panic with non-vmapped shmem BO

Pass array of pages of the scanout buffer [1] to shmem BO, allowing drm_panic to work even if the BO is not vmapped.

[1] https://lore.kernel.org/all/[email protected]/

---
 drivers/gpu/drm/virtio/virtgpu_plane.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/virtio/virtgpu_plane.c +11 -3
index a6f5a78f436a..2ff57d559c86 100644
@@ -500,11 +500,19 @@ static int virtio_drm_get_scanout_buffer(struct drm_plane *plane,
 
 	bo = gem_to_virtio_gpu_obj(plane->state->fb->obj[0]);
 
-	/* Only support mapped shmem bo */
-	if (virtio_gpu_is_vram(bo) || bo->base.base.import_attach || !bo->base.vaddr)
+	if (virtio_gpu_is_vram(bo) || bo->base.base.import_attach)
 		return -ENODEV;
 
-	iosys_map_set_vaddr(&sb->map[0], bo->base.vaddr);
+	if (bo->base.vaddr)
+		iosys_map_set_vaddr(&sb->map[0], bo->base.vaddr);
+	else {
+		struct drm_gem_shmem_object *shmem = &bo->base;
+
+		if (!shmem->pages)
+			return -ENODEV;
+		/* map scanout buffer later */
+		sb->pages = shmem->pages;
+	}
 
 	sb->format = plane->state->fb->format;
 	sb->height = plane->state->fb->height;

base-commit: e7bb7d44c3b97aea1f0e354c6499900154ac67f2

Signature · 1 line
2.49.0
maintainer Reviewed-by Tested-by on v1 1/1
#1 lore raw
Quoted 39 lines · Ryosuke Yasuoka

Pass array of pages of the scanout buffer [1] to shmem BO, allowing drm_panic to work even if the BO is not vmapped.

[1] https://lore.kernel.org/all/[email protected]/

---
 drivers/gpu/drm/virtio/virtgpu_plane.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/virtio/virtgpu_plane.c +11 -3
index a6f5a78f436a..2ff57d559c86 100644
@@ -500,11 +500,19 @@ static int virtio_drm_get_scanout_buffer(struct drm_plane *plane,
 
 	bo = gem_to_virtio_gpu_obj(plane->state->fb->obj[0]);
 
-	/* Only support mapped shmem bo */
-	if (virtio_gpu_is_vram(bo) || bo->base.base.import_attach || !bo->base.vaddr)
+	if (virtio_gpu_is_vram(bo) || bo->base.base.import_attach)
 		return -ENODEV;
 
-	iosys_map_set_vaddr(&sb->map[0], bo->base.vaddr);
+	if (bo->base.vaddr)
+		iosys_map_set_vaddr(&sb->map[0], bo->base.vaddr);
+	else {
+		struct drm_gem_shmem_object *shmem = &bo->base;
+
+		if (!shmem->pages)
+			return -ENODEV;
+		/* map scanout buffer later */
+		sb->pages = shmem->pages;
+	}
 
 	sb->format = plane->state->fb->format;
 	sb->height = plane->state->fb->height;
Quoted 1 line

base-commit: e7bb7d44c3b97aea1f0e354c6499900154ac67f2

Works well!

Signature · 2 lines
Best regards,
Dmitry
#2 lore raw
In reply to Ryosuke Yasuoka

Hi

Am 12.04.25 um 15:20 schrieb Ryosuke Yasuoka:

Quoted 16 lines

Pass array of pages of the scanout buffer [1] to shmem BO, allowing drm_panic to work even if the BO is not vmapped.

[1] https://lore.kernel.org/all/[email protected]/

---
  drivers/gpu/drm/virtio/virtgpu_plane.c | 14 +++++++++++---
  1 file changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/virtio/virtgpu_plane.c +0 -0
index a6f5a78f436a..2ff57d559c86 100644

drivers/gpu/drm/virtio/virtgpu_plane.c static int virtio_drm_get_scanout_buffer(struct drm_plane *plane, · line 503

Quoted 6 lines
drivers/gpu/drm/virtio/virtgpu_plane.c +1 -2
@@ -500,11 +500,19 @@ static int virtio_drm_get_scanout_buffer(struct drm_plane *plane,
 
  	bo = gem_to_virtio_gpu_obj(plane->state->fb->obj[0]);
 
-	/* Only support mapped shmem bo */
-	if (virtio_gpu_is_vram(bo) || bo->base.base.import_attach || !bo->base.vaddr)
+	if (virtio_gpu_is_vram(bo) || bo->base.base.import_attach)

Please adopt drm_gem_is_imported() instead of testing import_attach directly. The helper is available in v6.15-rc1 and later.

Best regards
Thomas

Quoted 18 lines
drivers/gpu/drm/virtio/virtgpu_plane.c +10 -1
  		return -ENODEV;
 
-	iosys_map_set_vaddr(&sb->map[0], bo->base.vaddr);
+	if (bo->base.vaddr)
+		iosys_map_set_vaddr(&sb->map[0], bo->base.vaddr);
+	else {
+		struct drm_gem_shmem_object *shmem = &bo->base;
+
+		if (!shmem->pages)
+			return -ENODEV;
+		/* map scanout buffer later */
+		sb->pages = shmem->pages;
+	}
 
  	sb->format = plane->state->fb->format;
  	sb->height = plane->state->fb->height;

base-commit: e7bb7d44c3b97aea1f0e354c6499900154ac67f2

Signature · 7 lines
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nuernberg)
maintainer
#3 lore raw
Quoted 25 lines · Thomas Zimmermann

Hi

Am 12.04.25 um 15:20 schrieb Ryosuke Yasuoka:

Quoted 22 lines

Pass array of pages of the scanout buffer [1] to shmem BO, allowing drm_panic to work even if the BO is not vmapped.

[1] https://lore.kernel.org/all/20250407140138.162383-3-
[email protected]/

---
  drivers/gpu/drm/virtio/virtgpu_plane.c | 14 +++++++++++---

  1 file changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/ renamed from drivers/gpu/drm/virtio/virtgpu_plane.c +0 -0

virtio/virtgpu_plane.c
index a6f5a78f436a..2ff57d559c86 100644

drivers/gpu/drm/virtio/virtgpu_plane.c +0 -0
@@ -500,11 +500,19 @@ static int virtio_drm_get_scanout_buffer(struct
 drm_plane *plane,
         bo = gem_to_virtio_gpu_obj(plane->state->fb->obj[0]);

  -    /* Only support mapped shmem bo */
-    if (virtio_gpu_is_vram(bo) || bo->base.base.import_attach || !bo-

Quoted 5 lines
Quoted 2 lines
Quoted 1 line

base.vaddr)

+    if (virtio_gpu_is_vram(bo) || bo->base.base.import_attach)

Please adopt drm_gem_is_imported() instead of testing import_attach directly. The helper is available in v6.15-rc1 and later.

Hi, I rebased this patch locally on top of your drm_gem_is_imported() changes and will merge it all soon.

Signature · 2 lines
Best regards,
Dmitry
maintainer
#4 lore raw
In reply to Ryosuke Yasuoka
Quoted 39 lines · Ryosuke Yasuoka

Pass array of pages of the scanout buffer [1] to shmem BO, allowing drm_panic to work even if the BO is not vmapped.

[1] https://lore.kernel.org/all/[email protected]/

---
 drivers/gpu/drm/virtio/virtgpu_plane.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/virtio/virtgpu_plane.c +11 -3
index a6f5a78f436a..2ff57d559c86 100644
@@ -500,11 +500,19 @@ static int virtio_drm_get_scanout_buffer(struct drm_plane *plane,
 
 	bo = gem_to_virtio_gpu_obj(plane->state->fb->obj[0]);
 
-	/* Only support mapped shmem bo */
-	if (virtio_gpu_is_vram(bo) || bo->base.base.import_attach || !bo->base.vaddr)
+	if (virtio_gpu_is_vram(bo) || bo->base.base.import_attach)
 		return -ENODEV;
 
-	iosys_map_set_vaddr(&sb->map[0], bo->base.vaddr);
+	if (bo->base.vaddr)
+		iosys_map_set_vaddr(&sb->map[0], bo->base.vaddr);
+	else {
+		struct drm_gem_shmem_object *shmem = &bo->base;
+
+		if (!shmem->pages)
+			return -ENODEV;
+		/* map scanout buffer later */
+		sb->pages = shmem->pages;
+	}
 
 	sb->format = plane->state->fb->format;
 	sb->height = plane->state->fb->height;
Quoted 1 line

base-commit: e7bb7d44c3b97aea1f0e354c6499900154ac67f2

Rebased on top of [1], fixed checkpatch warning about braces and applied to misc-next. Thanks!

[1] https://lore.kernel.org/all/[email protected]/

Signature · 2 lines
Best regards,
Dmitry
#5 lore raw
Quoted 41 lines · Dmitry Osipenko
Quoted 39 lines · Ryosuke Yasuoka

Pass array of pages of the scanout buffer [1] to shmem BO, allowing drm_panic to work even if the BO is not vmapped.

[1] https://lore.kernel.org/all/[email protected]/

---
 drivers/gpu/drm/virtio/virtgpu_plane.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/virtio/virtgpu_plane.c +11 -3
index a6f5a78f436a..2ff57d559c86 100644
@@ -500,11 +500,19 @@ static int virtio_drm_get_scanout_buffer(struct drm_plane *plane,
 
      bo = gem_to_virtio_gpu_obj(plane->state->fb->obj[0]);
 
-     /* Only support mapped shmem bo */
-     if (virtio_gpu_is_vram(bo) || bo->base.base.import_attach || !bo->base.vaddr)
+     if (virtio_gpu_is_vram(bo) || bo->base.base.import_attach)
              return -ENODEV;
 
-     iosys_map_set_vaddr(&sb->map[0], bo->base.vaddr);
+     if (bo->base.vaddr)
+             iosys_map_set_vaddr(&sb->map[0], bo->base.vaddr);
+     else {
+             struct drm_gem_shmem_object *shmem = &bo->base;
+
+             if (!shmem->pages)
+                     return -ENODEV;
+             /* map scanout buffer later */
+             sb->pages = shmem->pages;
+     }
 
      sb->format = plane->state->fb->format;
      sb->height = plane->state->fb->height;
Quoted 6 lines
Quoted 1 line

base-commit: e7bb7d44c3b97aea1f0e354c6499900154ac67f2

Rebased on top of [1], fixed checkpatch warning about braces and applied to misc-next. Thanks!

[1] https://lore.kernel.org/all/[email protected]/

Thomas,
Thank you for your comment.

Dmitry,
Thank you for fixing it and applying my patch.

Quoted 4 lines

--
Best regards,
Dmitry

Best regards,
Ryosuke