Re: [PATCH 01/28] drm/ttm: fix include notation and remove -Iinclude/drm flag

[Michel DÃnzer]

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@xxxxxxxxxxxxx>

[...]

> 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.


-- 
Earthling Michel DÃnzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer