|
| 1 | +From: Sasha Finkelstein < [email protected]> |
| 2 | + |
| 3 | +This allows running different page sizes between host and guest on |
| 4 | +platforms that support mixed page sizes. |
| 5 | + |
| 6 | +Signed-off-by: Sasha Finkelstein < [email protected]> |
| 7 | +--- |
| 8 | + drivers/gpu/drm/virtio/virtgpu_vram.c | 10 ++++++++-- |
| 9 | + 1 file changed, 8 insertions(+), 2 deletions(-) |
| 10 | + |
| 11 | +diff --git a/drivers/gpu/drm/virtio/virtgpu_vram.c b/drivers/gpu/drm/virtio/virtgpu_vram.c |
| 12 | +index 25df81c027837c248a746e41856b5aa7e216b8d5..8a0577c2170ec9c12cad12be57f9a41c14f04660 100644 |
| 13 | +--- a/drivers/gpu/drm/virtio/virtgpu_vram.c |
| 14 | ++++ b/drivers/gpu/drm/virtio/virtgpu_vram.c |
| 15 | +@@ -138,6 +138,12 @@ bool virtio_gpu_is_vram(struct virtio_gpu_object *bo) |
| 16 | + return bo->base.base.funcs == &virtio_gpu_vram_funcs; |
| 17 | + } |
| 18 | + |
| 19 | ++#if defined(__powerpc64__) || defined(__aarch64__) || defined(__mips__) || defined(__loongarch__) |
| 20 | ++#define MAX_PAGE_SIZE 65536 |
| 21 | ++#else |
| 22 | ++#define MAX_PAGE_SIZE PAGE_SIZE |
| 23 | ++#endif |
| 24 | ++ |
| 25 | + static int virtio_gpu_vram_map(struct virtio_gpu_object *bo) |
| 26 | + { |
| 27 | + int ret; |
| 28 | +@@ -150,8 +156,8 @@ static int virtio_gpu_vram_map(struct virtio_gpu_object *bo) |
| 29 | + return -EINVAL; |
| 30 | + |
| 31 | + spin_lock(&vgdev->host_visible_lock); |
| 32 | +- ret = drm_mm_insert_node(&vgdev->host_visible_mm, &vram->vram_node, |
| 33 | +- bo->base.base.size); |
| 34 | ++ ret = drm_mm_insert_node_generic(&vgdev->host_visible_mm, &vram->vram_node, |
| 35 | ++ bo->base.base.size, MAX_PAGE_SIZE, 0, 0); |
| 36 | + spin_unlock(&vgdev->host_visible_lock); |
| 37 | + |
| 38 | + if (ret) |
| 39 | + |
| 40 | +--- |
| 41 | +base-commit: 643e2e259c2b25a2af0ae4c23c6e16586d9fd19c |
| 42 | +change-id: 20250109-virtgpu-mixed-page-size-282b8f4a02fc |
| 43 | + |
| 44 | + |
| 45 | + |
0 commit comments