On Wed, Nov 18, 2020 at 01:49:51PM +0100, Christian König wrote: > Am 17.11.20 um 18:46 schrieb Daniel Vetter: > > On Tue, Nov 17, 2020 at 05:33:35PM +0100, Christian König wrote: > > > ttm_module.h deals with internals of TTM and should never > > > be include outside of it. > > > > > > Signed-off-by: Christian König <christian.koenig@xxxxxxx> > > Maybe also move it to drivers/gpu/drm/ttm/ttm_internal.h. We're using the > > _interal.h suffix in a few other places for module internal functions > > already. Perhaps in a follow-up? > > I've thought I already moved the header into drivers/gpu/drm/ttm/, but it > somehow got mangled into patch #2. > > Going to fix that and resend. > > > Anyway this here is Acked-by: Daniel Vetter <daniel.vetter@xxxxxxxx> > > For this one or the whole series? Please note that #2 removes the TTM sysfs > files. I think that nobody every used those, but who knows? Just this patch here, courage left me for the remaining ones today ... -Daniel > > Regards, > Christian. > > > (I didn't bother compile testing it on everything, just to make that > > clear). > > -Daniel > > > --- > > > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - > > > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 1 - > > > drivers/gpu/drm/nouveau/nouveau_drv.h | 1 - > > > drivers/gpu/drm/qxl/qxl_drv.h | 1 - > > > drivers/gpu/drm/qxl/qxl_ttm.c | 1 - > > > drivers/gpu/drm/radeon/radeon.h | 1 - > > > drivers/gpu/drm/radeon/radeon_ttm.c | 1 - > > > drivers/gpu/drm/ttm/ttm_agp_backend.c | 1 - > > > drivers/gpu/drm/ttm/ttm_bo_vm.c | 1 - > > > drivers/gpu/drm/ttm/ttm_range_manager.c | 1 - > > > drivers/gpu/drm/vmwgfx/ttm_object.c | 1 - > > > drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 - > > > drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 - > > > drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 1 - > > > drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 1 - > > > include/drm/ttm/ttm_bo_driver.h | 1 - > > > 16 files changed, 16 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > > > index 183b09d71b64..6e042b4ed13d 100644 > > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > > > @@ -55,7 +55,6 @@ > > > #include <drm/ttm/ttm_bo_api.h> > > > #include <drm/ttm/ttm_bo_driver.h> > > > #include <drm/ttm/ttm_placement.h> > > > -#include <drm/ttm/ttm_module.h> > > > #include <drm/ttm/ttm_execbuf_util.h> > > > #include <drm/amdgpu_drm.h> > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > > > index c438d290a6db..967859c6be3c 100644 > > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > > > @@ -46,7 +46,6 @@ > > > #include <drm/ttm/ttm_bo_api.h> > > > #include <drm/ttm/ttm_bo_driver.h> > > > #include <drm/ttm/ttm_placement.h> > > > -#include <drm/ttm/ttm_module.h> > > > #include <drm/drm_debugfs.h> > > > #include <drm/amdgpu_drm.h> > > > diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h > > > index 8e90b3e47bbe..700fa0979d14 100644 > > > --- a/drivers/gpu/drm/nouveau/nouveau_drv.h > > > +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h > > > @@ -54,7 +54,6 @@ > > > #include <drm/ttm/ttm_bo_api.h> > > > #include <drm/ttm/ttm_bo_driver.h> > > > #include <drm/ttm/ttm_placement.h> > > > -#include <drm/ttm/ttm_module.h> > > > #include <drm/drm_audio_component.h> > > > diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h > > > index 8bd0f916dfbc..83b54f0dad61 100644 > > > --- a/drivers/gpu/drm/qxl/qxl_drv.h > > > +++ b/drivers/gpu/drm/qxl/qxl_drv.h > > > @@ -46,7 +46,6 @@ > > > #include <drm/ttm/ttm_bo_api.h> > > > #include <drm/ttm/ttm_bo_driver.h> > > > #include <drm/ttm/ttm_execbuf_util.h> > > > -#include <drm/ttm/ttm_module.h> > > > #include <drm/ttm/ttm_placement.h> > > > #include "qxl_dev.h" > > > diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c > > > index 128c38c8a837..0cc661df2258 100644 > > > --- a/drivers/gpu/drm/qxl/qxl_ttm.c > > > +++ b/drivers/gpu/drm/qxl/qxl_ttm.c > > > @@ -31,7 +31,6 @@ > > > #include <drm/qxl_drm.h> > > > #include <drm/ttm/ttm_bo_api.h> > > > #include <drm/ttm/ttm_bo_driver.h> > > > -#include <drm/ttm/ttm_module.h> > > > #include <drm/ttm/ttm_placement.h> > > > #include "qxl_drv.h" > > > diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h > > > index 28cb8ced91b9..428c561a4e2c 100644 > > > --- a/drivers/gpu/drm/radeon/radeon.h > > > +++ b/drivers/gpu/drm/radeon/radeon.h > > > @@ -75,7 +75,6 @@ > > > #include <drm/ttm/ttm_bo_api.h> > > > #include <drm/ttm/ttm_bo_driver.h> > > > #include <drm/ttm/ttm_placement.h> > > > -#include <drm/ttm/ttm_module.h> > > > #include <drm/ttm/ttm_execbuf_util.h> > > > #include <drm/drm_gem.h> > > > diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c > > > index 0ca381b95d3d..2259d3811a45 100644 > > > --- a/drivers/gpu/drm/radeon/radeon_ttm.c > > > +++ b/drivers/gpu/drm/radeon/radeon_ttm.c > > > @@ -46,7 +46,6 @@ > > > #include <drm/radeon_drm.h> > > > #include <drm/ttm/ttm_bo_api.h> > > > #include <drm/ttm/ttm_bo_driver.h> > > > -#include <drm/ttm/ttm_module.h> > > > #include <drm/ttm/ttm_placement.h> > > > #include "radeon_reg.h" > > > diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c b/drivers/gpu/drm/ttm/ttm_agp_backend.c > > > index 03c86628e4ac..8f9fa4188897 100644 > > > --- a/drivers/gpu/drm/ttm/ttm_agp_backend.c > > > +++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c > > > @@ -32,7 +32,6 @@ > > > #define pr_fmt(fmt) "[TTM] " fmt > > > -#include <drm/ttm/ttm_module.h> > > > #include <drm/ttm/ttm_bo_driver.h> > > > #include <drm/ttm/ttm_placement.h> > > > #include <linux/agp_backend.h> > > > diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c > > > index 2944fa0af493..144a4940b6b6 100644 > > > --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c > > > +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c > > > @@ -31,7 +31,6 @@ > > > #define pr_fmt(fmt) "[TTM] " fmt > > > -#include <drm/ttm/ttm_module.h> > > > #include <drm/ttm/ttm_bo_driver.h> > > > #include <drm/ttm/ttm_placement.h> > > > #include <drm/drm_vma_manager.h> > > > diff --git a/drivers/gpu/drm/ttm/ttm_range_manager.c b/drivers/gpu/drm/ttm/ttm_range_manager.c > > > index ea77919569a2..4c0c756c9124 100644 > > > --- a/drivers/gpu/drm/ttm/ttm_range_manager.c > > > +++ b/drivers/gpu/drm/ttm/ttm_range_manager.c > > > @@ -29,7 +29,6 @@ > > > * 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_placement.h> > > > #include <drm/drm_mm.h> > > > diff --git a/drivers/gpu/drm/vmwgfx/ttm_object.c b/drivers/gpu/drm/vmwgfx/ttm_object.c > > > index 16077785ad47..0fe869d0fad1 100644 > > > --- a/drivers/gpu/drm/vmwgfx/ttm_object.c > > > +++ b/drivers/gpu/drm/vmwgfx/ttm_object.c > > > @@ -59,7 +59,6 @@ > > > #define pr_fmt(fmt) "[TTM] " fmt > > > -#include <drm/ttm/ttm_module.h> > > > #include <linux/list.h> > > > #include <linux/spinlock.h> > > > #include <linux/slab.h> > > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > > > index 1310857879e7..e6de876a016a 100644 > > > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > > > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > > > @@ -35,7 +35,6 @@ > > > #include <drm/drm_ioctl.h> > > > #include <drm/drm_sysfs.h> > > > #include <drm/ttm/ttm_bo_driver.h> > > > -#include <drm/ttm/ttm_module.h> > > > #include <drm/ttm/ttm_placement.h> > > > #include "ttm_object.h" > > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h > > > index b45becbb00f8..5b9a28157dd3 100644 > > > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h > > > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h > > > @@ -39,7 +39,6 @@ > > > #include <drm/ttm/ttm_bo_driver.h> > > > #include <drm/ttm/ttm_execbuf_util.h> > > > -#include <drm/ttm/ttm_module.h> > > > #include "ttm_lock.h" > > > #include "ttm_object.h" > > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c > > > index be325a62c178..8fe26e32f920 100644 > > > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c > > > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c > > > @@ -29,7 +29,6 @@ > > > */ > > > #include "vmwgfx_drv.h" > > > -#include <drm/ttm/ttm_module.h> > > > #include <drm/ttm/ttm_bo_driver.h> > > > #include <drm/ttm/ttm_placement.h> > > > #include <linux/idr.h> > > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c b/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c > > > index 155ca3a5c7e5..e8e79de255cf 100644 > > > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c > > > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c > > > @@ -5,7 +5,6 @@ > > > * Copyright (C) 2007-2019 Vmware, Inc. All rights reservedd. > > > */ > > > #include "vmwgfx_drv.h" > > > -#include <drm/ttm/ttm_module.h> > > > #include <drm/ttm/ttm_bo_driver.h> > > > #include <drm/ttm/ttm_placement.h> > > > diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h > > > index 54788a5160a0..fdf01c7f1f99 100644 > > > --- a/include/drm/ttm/ttm_bo_driver.h > > > +++ b/include/drm/ttm/ttm_bo_driver.h > > > @@ -38,7 +38,6 @@ > > > #include <linux/dma-resv.h> > > > #include "ttm_bo_api.h" > > > -#include "ttm_module.h" > > > #include "ttm_placement.h" > > > #include "ttm_tt.h" > > > #include "ttm_pool.h" > > > -- > > > 2.25.1 > > > > > > _______________________________________________ > > > dri-devel mailing list > > > dri-devel@xxxxxxxxxxxxxxxxxxxxx > > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
