drm/ttm: fix include notation and remove -Iinclude/drm flag
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Mon, 24 Apr 2017 04:50:20 +0000 (13:50 +0900)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 16 May 2017 15:17:16 +0000 (17:17 +0200)
For the C file, include <drm/*.h> instead of relative path from
include/drm.

For headers in include/drm/ttm, simplify the <tty/*.h> with "*.h".

This allows us to remove the -Iinclude/drm compiler flag from
drivers/gpu/drm/ttm/Makefile (and from other drivers' Makefiles).

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1493009447-31524-3-git-send-email-yamada.masahiro@socionext.com
drivers/gpu/drm/ttm/Makefile
drivers/gpu/drm/ttm/ttm_bo_vm.c
include/drm/ttm/ttm_bo_driver.h
include/drm/ttm/ttm_execbuf_util.h
include/drm/ttm/ttm_lock.h
include/drm/ttm/ttm_object.h

index f92325800f8a3e6309c9687dbbbbb28bc408ea9b..4d0c938ff4b215d7f6324e883472d417b8ade158 100644 (file)
@@ -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 \
index 9f53df95f35c55a061f2682ef35a5bfe6dec40c2..b442d12f2f7d64819faff9eace7bdc51fa199f89 100644 (file)
@@ -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>
index 6bbd34d25a8de0d2d137ba1b9de82b29990f858a..990d529f823c6e751c0fdb60130fe1b924b83416 100644 (file)
 #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/drm_mm.h>
 #include <drm/drm_global.h>
 #include <drm/drm_vma_manager.h>
 #include <linux/spinlock.h>
 #include <linux/reservation.h>
 
+#include "ttm_bo_api.h"
+#include "ttm_memory.h"
+#include "ttm_module.h"
+#include "ttm_placement.h"
+
 #define TTM_MAX_BO_PRIORITY    4U
 
 struct ttm_backend_func {
index 47f35b8e6d09249732bd0037b374d58a56b49c75..b0fdd1980034c592c5fdcb64cd05d5ee29df91d8 100644 (file)
 #ifndef _TTM_EXECBUF_UTIL_H_
 #define _TTM_EXECBUF_UTIL_H_
 
-#include <ttm/ttm_bo_api.h>
 #include <linux/list.h>
 
+#include "ttm_bo_api.h"
+
 /**
  * struct ttm_validate_buffer
  *
index 2902beb5f689192c127327a7a6f1affa3e1fe016..0c3af98368634d1624d34c97deb2c3630cd70030 100644 (file)
 #ifndef _TTM_LOCK_H_
 #define _TTM_LOCK_H_
 
-#include <ttm/ttm_object.h>
 #include <linux/wait.h>
 #include <linux/atomic.h>
 
+#include "ttm_object.h"
+
 /**
  * struct ttm_lock
  *
index 1487011fe057ba4b35271bc85e52c6b90291c2c3..a98bfeb4239edf09be7d253c09a9211fcdc134c6 100644 (file)
@@ -42,7 +42,8 @@
 #include <linux/kref.h>
 #include <linux/rcupdate.h>
 #include <linux/dma-buf.h>
-#include <ttm/ttm_memory.h>
+
+#include "ttm_memory.h"
 
 /**
  * enum ttm_ref_type