From 9672ddcc3a204d8eda061ac5a0b96a88c84af207 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Mon, 11 Dec 2023 14:11:57 +0100 Subject: [PATCH] panvk: Add pan_kmod_{vm,dev} objects to panvk_device Will be needed for when we will transition away from panfrost_{bo,device}. Signed-off-by: Boris Brezillon Reviewed-by: Constantine Shablya Reviewed-by: Erik Faye-Lund Part-of: --- src/panfrost/vulkan/panvk_device.c | 2 ++ src/panfrost/vulkan/panvk_private.h | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/src/panfrost/vulkan/panvk_device.c b/src/panfrost/vulkan/panvk_device.c index 31d5ba85aa8..8822bd74fa0 100644 --- a/src/panfrost/vulkan/panvk_device.c +++ b/src/panfrost/vulkan/panvk_device.c @@ -939,6 +939,8 @@ panvk_CreateDevice(VkPhysicalDevice physicalDevice, panfrost_open_device(NULL, dup(physical_device->kmod.dev->fd), &device->pdev); + device->kmod.dev = device->pdev.kmod.dev; + device->kmod.vm = device->pdev.kmod.vm; vk_device_set_drm_fd(&device->vk, device->pdev.kmod.dev->fd); panvk_arch_dispatch(arch, meta_init, device); diff --git a/src/panfrost/vulkan/panvk_private.h b/src/panfrost/vulkan/panvk_private.h index d7fe045ec8e..2e244459fab 100644 --- a/src/panfrost/vulkan/panvk_private.h +++ b/src/panfrost/vulkan/panvk_private.h @@ -253,6 +253,11 @@ struct panvk_queue { struct panvk_device { struct vk_device vk; + struct { + struct pan_kmod_vm *vm; + struct pan_kmod_dev *dev; + } kmod; + struct panfrost_device pdev; struct panvk_meta meta;