diff options
| author | Chia-I Wu <olvaffe@gmail.com> | 2019-01-11 10:09:53 -0800 |
|---|---|---|
| committer | Chia-I Wu <olvaffe@gmail.com> | 2019-03-11 10:01:41 -0700 |
| commit | a25a803127c5f59ce9049d22c85e5dd7771014f6 (patch) | |
| tree | 12fe080514cf4a7cbd1ac5f4883975b47da3b185 | |
| parent | 91232c52fe49848aa622a31e38e5ba0d008d08e0 (diff) | |
turnip: remove unnecessary libfreedreno_drm dep
Remove libfreedreno_drm dep and unused fd_device.
| -rw-r--r-- | src/freedreno/vulkan/meson.build | 1 | ||||
| -rw-r--r-- | src/freedreno/vulkan/tu_device.c | 11 | ||||
| -rw-r--r-- | src/freedreno/vulkan/tu_private.h | 2 |
3 files changed, 0 insertions, 14 deletions
diff --git a/src/freedreno/vulkan/meson.build b/src/freedreno/vulkan/meson.build index 889dad9b1de..e6931645c96 100644 --- a/src/freedreno/vulkan/meson.build +++ b/src/freedreno/vulkan/meson.build @@ -84,7 +84,6 @@ libvulkan_freedreno = shared_library( inc_freedreno, ], link_with : [ - libfreedreno_drm, libvulkan_util, libmesa_util, ], diff --git a/src/freedreno/vulkan/tu_device.c b/src/freedreno/vulkan/tu_device.c index c7550ae03de..65a0e405452 100644 --- a/src/freedreno/vulkan/tu_device.c +++ b/src/freedreno/vulkan/tu_device.c @@ -214,15 +214,6 @@ tu_physical_device_init(struct tu_physical_device *device, device->master_fd = master_fd; device->local_fd = fd; - device->drm_device = fd_device_new_dup(fd); - if (!device->drm_device) { - if (instance->debug_flags & TU_DEBUG_STARTUP) - tu_logi("Could not create the libdrm device"); - result = vk_errorf(instance, VK_ERROR_INITIALIZATION_FAILED, - "could not create the libdrm device"); - goto fail; - } - if (tu_drm_query_param(device, MSM_PARAM_GPU_ID, &val)) { if (instance->debug_flags & TU_DEBUG_STARTUP) tu_logi("Could not query the GPU ID"); @@ -282,8 +273,6 @@ tu_physical_device_init(struct tu_physical_device *device, return VK_SUCCESS; fail: - if (device->drm_device) - fd_device_del(device->drm_device); close(fd); if (master_fd != -1) close(master_fd); diff --git a/src/freedreno/vulkan/tu_private.h b/src/freedreno/vulkan/tu_private.h index 5a9e55aa8ef..7209785840e 100644 --- a/src/freedreno/vulkan/tu_private.h +++ b/src/freedreno/vulkan/tu_private.h @@ -66,7 +66,6 @@ typedef uint32_t xcb_window_t; #include <vulkan/vulkan.h> #include <vulkan/vulkan_intel.h> -#include "drm/freedreno_ringbuffer.h" #include "tu_entrypoints.h" #define MAX_VBS 32 @@ -293,7 +292,6 @@ struct tu_physical_device int local_fd; int master_fd; - struct fd_device *drm_device; unsigned gpu_id; uint32_t gmem_size; |