From 68ba0f4dfbe7bc69e157afdefd8c5ec4ec87d27e Mon Sep 17 00:00:00 2001 From: Jason Macnak Date: Wed, 27 Mar 2024 12:59:31 -0700 Subject: [PATCH] ANDROID: 16K: __PAGE_ALIGN() virtio gpu dumb buffers Bug: 330556068 Test: cvd start \ --gpu_mode=guest_swiftshader \ --kernel_path=out/virtual_device_x86_64/dist/bzImage \ --initramfs_path=/out/virtual_device_x86_64/dist/initramfs.img \ --extra_kernel_cmdline="androidboot.page_shift=14" Test: then open lens w/ camera Change-Id: I616b249a2fe2385262d75901b352b1fda0abc5e4 Signed-off-by: Jason Macnak --- drivers/gpu/drm/virtio/virtgpu_gem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_gem.c b/drivers/gpu/drm/virtio/virtgpu_gem.c index 7db48d17ee3a..34a1ea923403 100644 --- a/drivers/gpu/drm/virtio/virtgpu_gem.c +++ b/drivers/gpu/drm/virtio/virtgpu_gem.c @@ -25,6 +25,7 @@ #include #include +#include #include "virtgpu_drv.h" @@ -73,7 +74,7 @@ int virtio_gpu_mode_dumb_create(struct drm_file *file_priv, pitch = args->width * 4; args->size = pitch * args->height; - args->size = ALIGN(args->size, PAGE_SIZE); + args->size = ALIGN(args->size, __PAGE_SIZE); params.format = virtio_gpu_translate_format(DRM_FORMAT_HOST_XRGB8888); params.width = args->width;