| Message ID | 1492682232-29769-2-git-send-email-yamada.masahiro@socionext.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 20/04/17 06:56 PM, Masahiro Yamada wrote: > Include <drm/*.h> instead of relative path from include/drm, then > remove the -Iinclude/drm compiler flag. > > The fixes of include/drm/ttm/*.h will help driver Makefiles drop > -Iinclude/drm flag. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> [...] > diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h > index 6bbd34d..5071d0e 100644 > --- a/include/drm/ttm/ttm_bo_driver.h > +++ b/include/drm/ttm/ttm_bo_driver.h > @@ -30,10 +30,10 @@ > #ifndef _TTM_BO_DRIVER_H_ > #define _TTM_BO_DRIVER_H_ > > -#include <ttm/ttm_bo_api.h> > -#include <ttm/ttm_memory.h> > -#include <ttm/ttm_module.h> > -#include <ttm/ttm_placement.h> > +#include <drm/ttm/ttm_bo_api.h> > +#include <drm/ttm/ttm_memory.h> > +#include <drm/ttm/ttm_module.h> > +#include <drm/ttm/ttm_placement.h> > #include <drm/drm_mm.h> > #include <drm/drm_global.h> > #include <drm/drm_vma_manager.h> > diff --git a/include/drm/ttm/ttm_execbuf_util.h b/include/drm/ttm/ttm_execbuf_util.h > index 47f35b8..3ad2477 100644 > --- a/include/drm/ttm/ttm_execbuf_util.h > +++ b/include/drm/ttm/ttm_execbuf_util.h > @@ -31,7 +31,7 @@ > #ifndef _TTM_EXECBUF_UTIL_H_ > #define _TTM_EXECBUF_UTIL_H_ > > -#include <ttm/ttm_bo_api.h> > +#include <drm/ttm/ttm_bo_api.h> > #include <linux/list.h> > > /** > diff --git a/include/drm/ttm/ttm_lock.h b/include/drm/ttm/ttm_lock.h > index 2902beb..e8a5fcf 100644 > --- a/include/drm/ttm/ttm_lock.h > +++ b/include/drm/ttm/ttm_lock.h > @@ -49,7 +49,7 @@ > #ifndef _TTM_LOCK_H_ > #define _TTM_LOCK_H_ > > -#include <ttm/ttm_object.h> > +#include <drm/ttm/ttm_object.h> > #include <linux/wait.h> > #include <linux/atomic.h> > > diff --git a/include/drm/ttm/ttm_object.h b/include/drm/ttm/ttm_object.h > index 1487011..1c1b9cc 100644 > --- a/include/drm/ttm/ttm_object.h > +++ b/include/drm/ttm/ttm_object.h > @@ -42,7 +42,7 @@ > #include <linux/kref.h> > #include <linux/rcupdate.h> > #include <linux/dma-buf.h> > -#include <ttm/ttm_memory.h> > +#include <drm/ttm/ttm_memory.h> > > /** > * enum ttm_ref_type > These could all be simplified to #include "ttm_memory.h" etc.
diff --git a/drivers/gpu/drm/ttm/Makefile b/drivers/gpu/drm/ttm/Makefile index f923258..4d0c938 100644 --- a/drivers/gpu/drm/ttm/Makefile +++ b/drivers/gpu/drm/ttm/Makefile @@ -1,7 +1,6 @@ # # Makefile for the drm device driver. This driver provides support for the -ccflags-y := -Iinclude/drm ttm-y := ttm_memory.o ttm_tt.o ttm_bo.o \ ttm_bo_util.o ttm_bo_vm.o ttm_module.o \ ttm_object.o ttm_lock.o ttm_execbuf_util.o ttm_page_alloc.o \ diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c index 9f53df9..b442d12 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -30,9 +30,9 @@ #define pr_fmt(fmt) "[TTM] " fmt -#include <ttm/ttm_module.h> -#include <ttm/ttm_bo_driver.h> -#include <ttm/ttm_placement.h> +#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> #include <linux/mm.h> #include <linux/pfn_t.h> diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 6bbd34d..5071d0e 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -30,10 +30,10 @@ #ifndef _TTM_BO_DRIVER_H_ #define _TTM_BO_DRIVER_H_ -#include <ttm/ttm_bo_api.h> -#include <ttm/ttm_memory.h> -#include <ttm/ttm_module.h> -#include <ttm/ttm_placement.h> +#include <drm/ttm/ttm_bo_api.h> +#include <drm/ttm/ttm_memory.h> +#include <drm/ttm/ttm_module.h> +#include <drm/ttm/ttm_placement.h> #include <drm/drm_mm.h> #include <drm/drm_global.h> #include <drm/drm_vma_manager.h> diff --git a/include/drm/ttm/ttm_execbuf_util.h b/include/drm/ttm/ttm_execbuf_util.h index 47f35b8..3ad2477 100644 --- a/include/drm/ttm/ttm_execbuf_util.h +++ b/include/drm/ttm/ttm_execbuf_util.h @@ -31,7 +31,7 @@ #ifndef _TTM_EXECBUF_UTIL_H_ #define _TTM_EXECBUF_UTIL_H_ -#include <ttm/ttm_bo_api.h> +#include <drm/ttm/ttm_bo_api.h> #include <linux/list.h> /** diff --git a/include/drm/ttm/ttm_lock.h b/include/drm/ttm/ttm_lock.h index 2902beb..e8a5fcf 100644 --- a/include/drm/ttm/ttm_lock.h +++ b/include/drm/ttm/ttm_lock.h @@ -49,7 +49,7 @@ #ifndef _TTM_LOCK_H_ #define _TTM_LOCK_H_ -#include <ttm/ttm_object.h> +#include <drm/ttm/ttm_object.h> #include <linux/wait.h> #include <linux/atomic.h> diff --git a/include/drm/ttm/ttm_object.h b/include/drm/ttm/ttm_object.h index 1487011..1c1b9cc 100644 --- a/include/drm/ttm/ttm_object.h +++ b/include/drm/ttm/ttm_object.h @@ -42,7 +42,7 @@ #include <linux/kref.h> #include <linux/rcupdate.h> #include <linux/dma-buf.h> -#include <ttm/ttm_memory.h> +#include <drm/ttm/ttm_memory.h> /** * enum ttm_ref_type
Include <drm/*.h> instead of relative path from include/drm, then remove the -Iinclude/drm compiler flag. The fixes of include/drm/ttm/*.h will help driver Makefiles drop -Iinclude/drm flag. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- drivers/gpu/drm/ttm/Makefile | 1 - drivers/gpu/drm/ttm/ttm_bo_vm.c | 6 +++--- include/drm/ttm/ttm_bo_driver.h | 8 ++++---- include/drm/ttm/ttm_execbuf_util.h | 2 +- include/drm/ttm/ttm_lock.h | 2 +- include/drm/ttm/ttm_object.h | 2 +- 6 files changed, 10 insertions(+), 11 deletions(-)