Commit 5cf82904 authored by Christian König's avatar Christian König

drm/ttm/drivers: remove unecessary ttm_module.h include v2

ttm_module.h deals with internals of TTM and should never
be include outside of it.

v2: also move the file around
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/404885/
parent 025ae825
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
#include <drm/ttm/ttm_bo_api.h> #include <drm/ttm/ttm_bo_api.h>
#include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_placement.h> #include <drm/ttm/ttm_placement.h>
#include <drm/ttm/ttm_module.h>
#include <drm/ttm/ttm_execbuf_util.h> #include <drm/ttm/ttm_execbuf_util.h>
#include <drm/amdgpu_drm.h> #include <drm/amdgpu_drm.h>
......
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <drm/ttm/ttm_bo_api.h> #include <drm/ttm/ttm_bo_api.h>
#include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_placement.h> #include <drm/ttm/ttm_placement.h>
#include <drm/ttm/ttm_module.h>
#include <drm/drm_debugfs.h> #include <drm/drm_debugfs.h>
#include <drm/amdgpu_drm.h> #include <drm/amdgpu_drm.h>
......
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
#include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_placement.h> #include <drm/ttm/ttm_placement.h>
#include <drm/ttm/ttm_memory.h> #include <drm/ttm/ttm_memory.h>
#include <drm/ttm/ttm_module.h>
#include <drm/drm_audio_component.h> #include <drm/drm_audio_component.h>
......
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <drm/ttm/ttm_bo_api.h> #include <drm/ttm/ttm_bo_api.h>
#include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_execbuf_util.h> #include <drm/ttm/ttm_execbuf_util.h>
#include <drm/ttm/ttm_module.h>
#include <drm/ttm/ttm_placement.h> #include <drm/ttm/ttm_placement.h>
#include "qxl_dev.h" #include "qxl_dev.h"
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include <drm/qxl_drm.h> #include <drm/qxl_drm.h>
#include <drm/ttm/ttm_bo_api.h> #include <drm/ttm/ttm_bo_api.h>
#include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_module.h>
#include <drm/ttm/ttm_placement.h> #include <drm/ttm/ttm_placement.h>
#include "qxl_drv.h" #include "qxl_drv.h"
......
...@@ -75,7 +75,6 @@ ...@@ -75,7 +75,6 @@
#include <drm/ttm/ttm_bo_api.h> #include <drm/ttm/ttm_bo_api.h>
#include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_placement.h> #include <drm/ttm/ttm_placement.h>
#include <drm/ttm/ttm_module.h>
#include <drm/ttm/ttm_execbuf_util.h> #include <drm/ttm/ttm_execbuf_util.h>
#include <drm/drm_gem.h> #include <drm/drm_gem.h>
......
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <drm/radeon_drm.h> #include <drm/radeon_drm.h>
#include <drm/ttm/ttm_bo_api.h> #include <drm/ttm/ttm_bo_api.h>
#include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_module.h>
#include <drm/ttm/ttm_placement.h> #include <drm/ttm/ttm_placement.h>
#include "radeon_reg.h" #include "radeon_reg.h"
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#define pr_fmt(fmt) "[TTM] " fmt #define pr_fmt(fmt) "[TTM] " fmt
#include <drm/ttm/ttm_module.h>
#include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_placement.h> #include <drm/ttm/ttm_placement.h>
#include <linux/agp_backend.h> #include <linux/agp_backend.h>
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#define pr_fmt(fmt) "[TTM] " fmt #define pr_fmt(fmt) "[TTM] " fmt
#include <drm/ttm/ttm_module.h>
#include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_placement.h> #include <drm/ttm/ttm_placement.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
...@@ -43,6 +42,8 @@ ...@@ -43,6 +42,8 @@
#include <linux/atomic.h> #include <linux/atomic.h>
#include <linux/dma-resv.h> #include <linux/dma-resv.h>
#include "ttm_module.h"
static void ttm_bo_global_kobj_release(struct kobject *kobj); static void ttm_bo_global_kobj_release(struct kobject *kobj);
/* /*
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#define pr_fmt(fmt) "[TTM] " fmt #define pr_fmt(fmt) "[TTM] " fmt
#include <drm/ttm/ttm_module.h>
#include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_placement.h> #include <drm/ttm/ttm_placement.h>
#include <drm/drm_vma_manager.h> #include <drm/drm_vma_manager.h>
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#define pr_fmt(fmt) "[TTM] " fmt #define pr_fmt(fmt) "[TTM] " fmt
#include <drm/ttm/ttm_memory.h> #include <drm/ttm/ttm_memory.h>
#include <drm/ttm/ttm_module.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/wait.h> #include <linux/wait.h>
...@@ -39,6 +38,8 @@ ...@@ -39,6 +38,8 @@
#include <linux/swap.h> #include <linux/swap.h>
#include <drm/ttm/ttm_pool.h> #include <drm/ttm/ttm_pool.h>
#include "ttm_module.h"
#define TTM_MEMORY_ALLOC_RETRIES 4 #define TTM_MEMORY_ALLOC_RETRIES 4
struct ttm_mem_global ttm_mem_glob; struct ttm_mem_global ttm_mem_glob;
......
...@@ -32,9 +32,10 @@ ...@@ -32,9 +32,10 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <drm/ttm/ttm_module.h>
#include <drm/drm_sysfs.h> #include <drm/drm_sysfs.h>
#include "ttm_module.h"
static DECLARE_WAIT_QUEUE_HEAD(exit_q); static DECLARE_WAIT_QUEUE_HEAD(exit_q);
static atomic_t device_released; static atomic_t device_released;
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
* Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com> * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
*/ */
#include <drm/ttm/ttm_module.h>
#include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_placement.h> #include <drm/ttm/ttm_placement.h>
#include <drm/drm_mm.h> #include <drm/drm_mm.h>
......
...@@ -59,7 +59,6 @@ ...@@ -59,7 +59,6 @@
#define pr_fmt(fmt) "[TTM] " fmt #define pr_fmt(fmt) "[TTM] " fmt
#include <drm/ttm/ttm_module.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/slab.h> #include <linux/slab.h>
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <drm/drm_ioctl.h> #include <drm/drm_ioctl.h>
#include <drm/drm_sysfs.h> #include <drm/drm_sysfs.h>
#include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_module.h>
#include <drm/ttm/ttm_placement.h> #include <drm/ttm/ttm_placement.h>
#include "ttm_object.h" #include "ttm_object.h"
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_execbuf_util.h> #include <drm/ttm/ttm_execbuf_util.h>
#include <drm/ttm/ttm_module.h>
#include "ttm_lock.h" #include "ttm_lock.h"
#include "ttm_object.h" #include "ttm_object.h"
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
*/ */
#include "vmwgfx_drv.h" #include "vmwgfx_drv.h"
#include <drm/ttm/ttm_module.h>
#include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_placement.h> #include <drm/ttm/ttm_placement.h>
#include <linux/idr.h> #include <linux/idr.h>
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
* Copyright (C) 2007-2019 Vmware, Inc. All rights reservedd. * Copyright (C) 2007-2019 Vmware, Inc. All rights reservedd.
*/ */
#include "vmwgfx_drv.h" #include "vmwgfx_drv.h"
#include <drm/ttm/ttm_module.h>
#include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_placement.h> #include <drm/ttm/ttm_placement.h>
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#include "ttm_bo_api.h" #include "ttm_bo_api.h"
#include "ttm_memory.h" #include "ttm_memory.h"
#include "ttm_module.h"
#include "ttm_placement.h" #include "ttm_placement.h"
#include "ttm_tt.h" #include "ttm_tt.h"
#include "ttm_pool.h" #include "ttm_pool.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment