lkml.org 
[lkml]   [2017]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 02/29] drm/ttm: fix include notation and remove -Iinclude/drm flag
    Date
    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>
    ---

    Changes in v2:
    - Use #include "..." for headers (Michel Danzer)

    drivers/gpu/drm/ttm/Makefile | 1 -
    drivers/gpu/drm/ttm/ttm_bo_vm.c | 6 +++---
    include/drm/ttm/ttm_bo_driver.h | 9 +++++----
    include/drm/ttm/ttm_execbuf_util.h | 3 ++-
    include/drm/ttm/ttm_lock.h | 3 ++-
    include/drm/ttm/ttm_object.h | 3 ++-
    6 files changed, 14 insertions(+), 11 deletions(-)

    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..990d529 100644
    --- a/include/drm/ttm/ttm_bo_driver.h
    +++ b/include/drm/ttm/ttm_bo_driver.h
    @@ -30,10 +30,6 @@
    #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>
    @@ -42,6 +38,11 @@
    #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 {
    diff --git a/include/drm/ttm/ttm_execbuf_util.h b/include/drm/ttm/ttm_execbuf_util.h
    index 47f35b8..b0fdd19 100644
    --- a/include/drm/ttm/ttm_execbuf_util.h
    +++ b/include/drm/ttm/ttm_execbuf_util.h
    @@ -31,9 +31,10 @@
    #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
    *
    diff --git a/include/drm/ttm/ttm_lock.h b/include/drm/ttm/ttm_lock.h
    index 2902beb..0c3af98 100644
    --- a/include/drm/ttm/ttm_lock.h
    +++ b/include/drm/ttm/ttm_lock.h
    @@ -49,10 +49,11 @@
    #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
    *
    diff --git a/include/drm/ttm/ttm_object.h b/include/drm/ttm/ttm_object.h
    index 1487011..a98bfeb 100644
    --- a/include/drm/ttm/ttm_object.h
    +++ b/include/drm/ttm/ttm_object.h
    @@ -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
    --
    2.7.4
    \
     
     \ /
      Last update: 2017-04-24 06:57    [W:3.390 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site