[PATCH v2 00/29] gpu/drm: remove -Iinclude/drm compiler flags from Makefile

[PATCH v2 00/29] gpu/drm: remove -Iinclude/drm compiler flags from Makefile

[Masahiro Yamada]

Many Makefiles needed to add -Iinclude/drm as an include path,
but the right thing to do is to include headers in the form
  #include <drm/.../*.h>

This series fixes the source files, then rip off -Iinclude/drm flags.


Masahiro Yamada (29):
  drm: make drm_panel.h self-contained
  drm/ttm: fix include notation and remove -Iinclude/drm flag
  drm/amd: fix include notation and remove -Iinclude/drm flag
  drm/ast: fix include notation and remove -Iinclude/drm flag
  drm/bochs: fix include notation and remove -Iinclude/drm flag
  drm/bridge: fix include notation and remove -Iinclude/drm flag
  drm/cirrus: fix include notation and remove -Iinclude/drm flag
  drm/hisilicon: fix include notation and remove -Iinclude/drm flag
  drm/mgag200: fix include notation and remove -Iinclude/drm flag
  drm/msm: fix include notation and remove -Iinclude/drm flag
  drm/nouveau: fix include notation and remove -Iinclude/drm flag
  drm/qxl: fix include notation and remove -Iinclude/drm flag
  drm/radeon: fix include notation and remove -Iinclude/drm flag
  drm/tilcdc: fix include notation and remove -Iinclude/drm flag
  drm/vc4: fix include notation and remove -Iinclude/drm flag
  drm/virtio: fix include notation and remove -Iinclude/drm flag
  drm/vmwgfx: fix include notation and remove -Iinclude/drm flag
  drm/gma500: remove unneeded -Iinclude/drm compiler flag
  drm/i810: remove unneeded -Iinclude/drm compiler flag
  drm/i2c: remove unneeded -Iinclude/drm compiler flag
  drm/mga: remove unneeded -Iinclude/drm compiler flag
  drm/omap: remove unneeded -Iinclude/drm compiler flag
  drm/r128: remove unneeded -Iinclude/drm compiler flag
  drm/savage: remove unneeded -Iinclude/drm compiler flag
  drm/sis: remove unneeded -Iinclude/drm compiler flag
  drm/tdfx: remove unneeded -Iinclude/drm compiler flag
  drm/udl: remove unneeded -Iinclude/drm compiler flag
  drm/vgem: remove unneeded -Iinclude/drm compiler flag
  drm/via: remove unneeded -Iinclude/drm compiler flag

 drivers/gpu/drm/amd/amdgpu/Makefile              |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu.h              | 10 ++++-----
 drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c          |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c          |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c          |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c          | 10 ++++-----
 drivers/gpu/drm/amd/amdgpu/ci_dpm.c              |  2 +-
 drivers/gpu/drm/amd/amdgpu/ci_smc.c              |  2 +-
 drivers/gpu/drm/amd/amdgpu/cik.c                 |  2 +-
 drivers/gpu/drm/amd/amdgpu/cik_ih.c              |  2 +-
 drivers/gpu/drm/amd/amdgpu/cz_ih.c               |  2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v10_0.c           |  2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c           |  2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v6_0.c            |  2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c            |  2 +-
 drivers/gpu/drm/amd/amdgpu/dce_virtual.c         |  2 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c            |  2 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c            |  2 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c            |  2 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c            |  2 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c            |  2 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c            |  2 +-
 drivers/gpu/drm/amd/amdgpu/iceland_ih.c          |  2 +-
 drivers/gpu/drm/amd/amdgpu/kv_dpm.c              |  2 +-
 drivers/gpu/drm/amd/amdgpu/kv_smc.c              |  2 +-
 drivers/gpu/drm/amd/amdgpu/psp_v3_1.c            |  2 +-
 drivers/gpu/drm/amd/amdgpu/si.c                  |  2 +-
 drivers/gpu/drm/amd/amdgpu/si_dpm.c              |  2 +-
 drivers/gpu/drm/amd/amdgpu/si_ih.c               |  2 +-
 drivers/gpu/drm/amd/amdgpu/si_smc.c              |  2 +-
 drivers/gpu/drm/amd/amdgpu/soc15.c               |  2 +-
 drivers/gpu/drm/amd/amdgpu/tonga_ih.c            |  2 +-
 drivers/gpu/drm/amd/amdgpu/vega10_ih.c           |  2 +-
 drivers/gpu/drm/amd/amdgpu/vi.c                  |  2 +-
 drivers/gpu/drm/amd/amdkfd/Makefile              |  2 +-
 drivers/gpu/drm/amd/powerplay/Makefile           |  2 +-
 drivers/gpu/drm/ast/Makefile                     |  2 --
 drivers/gpu/drm/ast/ast_ttm.c                    |  3 ++-
 drivers/gpu/drm/bochs/Makefile                   |  1 -
 drivers/gpu/drm/bochs/bochs.h                    |  4 ++--
 drivers/gpu/drm/bridge/Makefile                  |  2 --
 drivers/gpu/drm/bridge/nxp-ptn3460.c             | 12 +++++-----
 drivers/gpu/drm/bridge/parade-ps8622.c           | 10 ++++-----
 drivers/gpu/drm/cirrus/Makefile                  |  1 -
 drivers/gpu/drm/cirrus/cirrus_ttm.c              |  3 ++-
 drivers/gpu/drm/gma500/Makefile                  |  1 -
 drivers/gpu/drm/hisilicon/hibmc/Makefile         |  1 -
 drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c      |  2 +-
 drivers/gpu/drm/i2c/Makefile                     |  2 --
 drivers/gpu/drm/i810/Makefile                    |  1 -
 drivers/gpu/drm/mga/Makefile                     |  1 -
 drivers/gpu/drm/mgag200/Makefile                 |  1 -
 drivers/gpu/drm/mgag200/mgag200_ttm.c            |  3 ++-
 drivers/gpu/drm/msm/Makefile                     |  2 +-
 drivers/gpu/drm/msm/dsi/dsi.h                    |  6 ++---
 drivers/gpu/drm/msm/edp/edp.h                    |  4 ++--
 drivers/gpu/drm/msm/edp/edp_ctrl.c               |  6 ++---
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c         | 10 ++++-----
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c  |  6 ++---
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c  |  7 +++---
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h          |  4 +++-
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c |  6 ++---
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c  |  6 ++---
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c         | 10 ++++-----
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c      |  6 ++---
 drivers/gpu/drm/msm/msm_fb.c                     |  6 ++---
 drivers/gpu/drm/msm/msm_fbdev.c                  |  6 ++---
 drivers/gpu/drm/nouveau/Kbuild                   |  1 -
 drivers/gpu/drm/nouveau/nouveau_drm.c            |  4 ++--
 drivers/gpu/drm/nouveau/nouveau_drv.h            |  2 +-
 drivers/gpu/drm/nouveau/nouveau_ttm.c            |  2 +-
 drivers/gpu/drm/omapdrm/Makefile                 |  1 -
 drivers/gpu/drm/qxl/Makefile                     |  2 --
 drivers/gpu/drm/qxl/qxl_debugfs.c                |  2 +-
 drivers/gpu/drm/qxl/qxl_display.c                |  9 ++++----
 drivers/gpu/drm/qxl/qxl_drv.c                    |  6 ++---
 drivers/gpu/drm/qxl/qxl_drv.h                    | 18 +++++++--------
 drivers/gpu/drm/qxl/qxl_fb.c                     | 11 +++++-----
 drivers/gpu/drm/qxl/qxl_gem.c                    |  5 +++--
 drivers/gpu/drm/qxl/qxl_ttm.c                    | 10 ++++-----
 drivers/gpu/drm/r128/Makefile                    |  1 -
 drivers/gpu/drm/radeon/Makefile                  |  2 +-
 drivers/gpu/drm/radeon/btc_dpm.c                 |  2 +-
 drivers/gpu/drm/radeon/ci_dpm.c                  |  2 +-
 drivers/gpu/drm/radeon/ci_smc.c                  |  2 +-
 drivers/gpu/drm/radeon/cik.c                     |  2 +-
 drivers/gpu/drm/radeon/cypress_dpm.c             |  2 +-
 drivers/gpu/drm/radeon/kv_dpm.c                  |  2 +-
 drivers/gpu/drm/radeon/kv_smc.c                  |  2 +-
 drivers/gpu/drm/radeon/ni_dpm.c                  |  2 +-
 drivers/gpu/drm/radeon/r600_dpm.c                |  2 +-
 drivers/gpu/drm/radeon/radeon.h                  | 10 ++++-----
 drivers/gpu/drm/radeon/radeon_drv.c              |  2 +-
 drivers/gpu/drm/radeon/radeon_ttm.c              | 10 ++++-----
 drivers/gpu/drm/radeon/rs780_dpm.c               |  2 +-
 drivers/gpu/drm/radeon/rv6xx_dpm.c               |  2 +-
 drivers/gpu/drm/radeon/rv730_dpm.c               |  2 +-
 drivers/gpu/drm/radeon/rv740_dpm.c               |  2 +-
 drivers/gpu/drm/radeon/rv770_dpm.c               |  2 +-
 drivers/gpu/drm/radeon/rv770_smc.c               |  2 +-
 drivers/gpu/drm/radeon/si_dpm.c                  |  2 +-
 drivers/gpu/drm/radeon/si_smc.c                  |  2 +-
 drivers/gpu/drm/radeon/sumo_dpm.c                |  2 +-
 drivers/gpu/drm/radeon/sumo_smc.c                |  2 +-
 drivers/gpu/drm/radeon/trinity_dpm.c             |  2 +-
 drivers/gpu/drm/radeon/trinity_smc.c             |  2 +-
 drivers/gpu/drm/savage/Makefile                  |  1 -
 drivers/gpu/drm/sis/Makefile                     |  1 -
 drivers/gpu/drm/tdfx/Makefile                    |  1 -
 drivers/gpu/drm/tilcdc/Makefile                  |  1 -
 drivers/gpu/drm/tilcdc/tilcdc_drv.c              |  3 +--
 drivers/gpu/drm/ttm/Makefile                     |  1 -
 drivers/gpu/drm/ttm/ttm_bo_vm.c                  |  6 ++---
 drivers/gpu/drm/udl/Makefile                     |  3 ---
 drivers/gpu/drm/vc4/Makefile                     |  2 --
 drivers/gpu/drm/vc4/vc4_crtc.c                   | 14 ++++++------
 drivers/gpu/drm/vc4/vc4_dpi.c                    | 16 +++++++-------
 drivers/gpu/drm/vc4/vc4_drv.c                    |  2 +-
 drivers/gpu/drm/vc4/vc4_drv.h                    |  5 ++---
 drivers/gpu/drm/vc4/vc4_dsi.c                    | 28 ++++++++++++------------
 drivers/gpu/drm/vc4/vc4_hdmi.c                   | 20 ++++++++---------
 drivers/gpu/drm/vc4/vc4_hvs.c                    |  2 +-
 drivers/gpu/drm/vc4/vc4_kms.c                    | 12 +++++-----
 drivers/gpu/drm/vc4/vc4_plane.c                  |  9 ++++----
 drivers/gpu/drm/vc4/vc4_v3d.c                    |  4 ++--
 drivers/gpu/drm/vgem/Makefile                    |  1 -
 drivers/gpu/drm/via/Makefile                     |  1 -
 drivers/gpu/drm/virtio/Makefile                  |  2 --
 drivers/gpu/drm/virtio/virtgpu_debugfs.c         |  2 +-
 drivers/gpu/drm/virtio/virtgpu_drv.c             |  4 ++--
 drivers/gpu/drm/virtio/virtgpu_drv.h             |  8 +++----
 drivers/gpu/drm/virtio/virtgpu_ioctl.c           |  5 +++--
 drivers/gpu/drm/virtio/virtgpu_ttm.c             | 10 ++++-----
 drivers/gpu/drm/vmwgfx/Makefile                  |  3 ---
 drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c           |  3 ++-
 drivers/gpu/drm/vmwgfx/vmwgfx_context.c          |  3 ++-
 drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c          |  3 ++-
 drivers/gpu/drm/vmwgfx/vmwgfx_msg.c              |  2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_shader.c           |  3 ++-
 drivers/gpu/drm/vmwgfx/vmwgfx_surface.c          |  3 ++-
 include/drm/drm_panel.h                          |  2 ++
 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 ++-
 145 files changed, 271 insertions(+), 296 deletions(-)

-- 
2.7.4

[PATCH v2 01/29] drm: make drm_panel.h self-contained

[Masahiro Yamada]

-ENOSYS and -EINVAL are referenced in some static inline functions.
of_drm_find_pane() takes a pointer to struct device_node.

Make this header self-contained to not depend on specific include
order.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2: None

 include/drm/drm_panel.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/drm/drm_panel.h b/include/drm/drm_panel.h
index 1b364b0..14ac240 100644
--- a/include/drm/drm_panel.h
+++ b/include/drm/drm_panel.h
@@ -24,8 +24,10 @@
 #ifndef __DRM_PANEL_H__
 #define __DRM_PANEL_H__
 
+#include <linux/errno.h>
 #include <linux/list.h>
 
+struct device_node;
 struct drm_connector;
 struct drm_device;
 struct drm_panel;
-- 
2.7.4

[PATCH v2 02/29] drm/ttm: fix include notation and remove -Iinclude/drm flag

[Masahiro Yamada]

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

[PATCH v2 03/29] drm/amd: fix include notation and remove -Iinclude/drm flag

[Masahiro Yamada]

Include <drm/*.h> instead of relative path from include/drm, then
remove the -Iinclude/drm compiler flag.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
---

Changes in v2: None

 drivers/gpu/drm/amd/amdgpu/Makefile      |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu.h      | 10 +++++-----
 drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c  |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c  |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c  |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c  | 10 +++++-----
 drivers/gpu/drm/amd/amdgpu/ci_dpm.c      |  2 +-
 drivers/gpu/drm/amd/amdgpu/ci_smc.c      |  2 +-
 drivers/gpu/drm/amd/amdgpu/cik.c         |  2 +-
 drivers/gpu/drm/amd/amdgpu/cik_ih.c      |  2 +-
 drivers/gpu/drm/amd/amdgpu/cz_ih.c       |  2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v10_0.c   |  2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c   |  2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v6_0.c    |  2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c    |  2 +-
 drivers/gpu/drm/amd/amdgpu/dce_virtual.c |  2 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c    |  2 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c    |  2 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c    |  2 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c    |  2 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c    |  2 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c    |  2 +-
 drivers/gpu/drm/amd/amdgpu/iceland_ih.c  |  2 +-
 drivers/gpu/drm/amd/amdgpu/kv_dpm.c      |  2 +-
 drivers/gpu/drm/amd/amdgpu/kv_smc.c      |  2 +-
 drivers/gpu/drm/amd/amdgpu/psp_v3_1.c    |  2 +-
 drivers/gpu/drm/amd/amdgpu/si.c          |  2 +-
 drivers/gpu/drm/amd/amdgpu/si_dpm.c      |  2 +-
 drivers/gpu/drm/amd/amdgpu/si_ih.c       |  2 +-
 drivers/gpu/drm/amd/amdgpu/si_smc.c      |  2 +-
 drivers/gpu/drm/amd/amdgpu/soc15.c       |  2 +-
 drivers/gpu/drm/amd/amdgpu/tonga_ih.c    |  2 +-
 drivers/gpu/drm/amd/amdgpu/vega10_ih.c   |  2 +-
 drivers/gpu/drm/amd/amdgpu/vi.c          |  2 +-
 drivers/gpu/drm/amd/amdkfd/Makefile      |  2 +-
 drivers/gpu/drm/amd/powerplay/Makefile   |  2 +-
 36 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile
index 660786a..20bde72 100644
--- a/drivers/gpu/drm/amd/amdgpu/Makefile
+++ b/drivers/gpu/drm/amd/amdgpu/Makefile
@@ -4,7 +4,7 @@
 
 FULL_AMD_PATH=$(src)/..
 
-ccflags-y := -Iinclude/drm -I$(FULL_AMD_PATH)/include/asic_reg \
+ccflags-y := -I$(FULL_AMD_PATH)/include/asic_reg \
 	-I$(FULL_AMD_PATH)/include \
 	-I$(FULL_AMD_PATH)/amdgpu \
 	-I$(FULL_AMD_PATH)/scheduler \
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 6a81299..0ecf31d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -36,11 +36,11 @@
 #include <linux/hashtable.h>
 #include <linux/dma-fence.h>
 
-#include <ttm/ttm_bo_api.h>
-#include <ttm/ttm_bo_driver.h>
-#include <ttm/ttm_placement.h>
-#include <ttm/ttm_module.h>
-#include <ttm/ttm_execbuf_util.h>
+#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/drmP.h>
 #include <drm/drm_gem.h>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c
index 38e9b0d..1cb52fd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_atombios.h"
 #include "amdgpu_i2c.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 4e0f7d2..a86d2a3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -39,7 +39,7 @@
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 #include <linux/vga_switcheroo.h>
-#include "drm_crtc_helper.h"
+#include <drm/drm_crtc_helper.h>
 
 #include "amdgpu.h"
 #include "amdgpu_irq.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index ed6e579..e6cf91c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -24,7 +24,7 @@
  */
 
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_psp.h"
 #include "amdgpu_ucode.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 35d53a0..6a3028c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -29,11 +29,11 @@
  *    Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
  *    Dave Airlie
  */
-#include <ttm/ttm_bo_api.h>
-#include <ttm/ttm_bo_driver.h>
-#include <ttm/ttm_placement.h>
-#include <ttm/ttm_module.h>
-#include <ttm/ttm_page_alloc.h>
+#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_page_alloc.h>
 #include <drm/drmP.h>
 #include <drm/amdgpu_drm.h>
 #include <linux/seq_file.h>
diff --git a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
index 11ccda8..625b7fb 100644
--- a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
@@ -22,7 +22,7 @@
  */
 
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "amdgpu_ucode.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/ci_smc.c b/drivers/gpu/drm/amd/amdgpu/ci_smc.c
index 7eb9069..b8ba51e 100644
--- a/drivers/gpu/drm/amd/amdgpu/ci_smc.c
+++ b/drivers/gpu/drm/amd/amdgpu/ci_smc.c
@@ -23,7 +23,7 @@
  */
 
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "cikd.h"
 #include "ppsmc.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
index 9d33e56..6b20345 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik.c
@@ -24,7 +24,7 @@
 #include <linux/firmware.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_atombios.h"
 #include "amdgpu_ih.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/cik_ih.c b/drivers/gpu/drm/amd/amdgpu/cik_ih.c
index c57c3f1..b891843 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik_ih.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
 #include "cikd.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/cz_ih.c b/drivers/gpu/drm/amd/amdgpu/cz_ih.c
index a5f294e..0c1209c 100644
--- a/drivers/gpu/drm/amd/amdgpu/cz_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/cz_ih.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
 #include "vid.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
index ba98d35..85033be 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "amdgpu_i2c.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
index e59bc42..ab97616 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "amdgpu_i2c.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
index 307269b..0a3f7b7 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "amdgpu_i2c.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
index 6df7a28..3543fcb 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "amdgpu_i2c.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
index 81a24b6..4c53664 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "amdgpu_i2c.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
index 8a8bc2f..fa92b04f 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
@@ -21,7 +21,7 @@
  *
  */
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
 #include "amdgpu_gfx.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index dad8a4c..3493b53 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -21,7 +21,7 @@
  *
  */
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_gfx.h"
 #include "vi.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index a447b70..7153781 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -21,7 +21,7 @@
  *
  */
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_gfx.h"
 #include "soc15.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
index 631aef3..1713d25 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
@@ -21,7 +21,7 @@
  *
  */
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "gmc_v6_0.h"
 #include "amdgpu_ucode.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
index 92abe12..a84997f 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
@@ -21,7 +21,7 @@
  *
  */
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "cikd.h"
 #include "cik.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
index f2ccefc..094c69d 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
@@ -21,7 +21,7 @@
  *
  */
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "gmc_v8_0.h"
 #include "amdgpu_ucode.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/iceland_ih.c b/drivers/gpu/drm/amd/amdgpu/iceland_ih.c
index cb622ad..7a0ea27 100644
--- a/drivers/gpu/drm/amd/amdgpu/iceland_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/iceland_ih.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
 #include "vid.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
index 79a52ad2..3bbf2cc 100644
--- a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "cikd.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/kv_smc.c b/drivers/gpu/drm/amd/amdgpu/kv_smc.c
index e6b7b42..b82e33c 100644
--- a/drivers/gpu/drm/amd/amdgpu/kv_smc.c
+++ b/drivers/gpu/drm/amd/amdgpu/kv_smc.c
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "cikd.h"
 #include "kv_dpm.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
index c3588d1..5b4432c 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
@@ -24,7 +24,7 @@
  */
 
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_psp.h"
 #include "amdgpu_ucode.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c
index c0b1aab..2431639 100644
--- a/drivers/gpu/drm/amd/amdgpu/si.c
+++ b/drivers/gpu/drm/amd/amdgpu/si.c
@@ -24,7 +24,7 @@
 #include <linux/firmware.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_atombios.h"
 #include "amdgpu_ih.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/si_dpm.c b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
index 7c1c5d1..a7ad839 100644
--- a/drivers/gpu/drm/amd/amdgpu/si_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "amdgpu_dpm.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/si_ih.c b/drivers/gpu/drm/amd/amdgpu/si_ih.c
index e660842..ce25e03 100644
--- a/drivers/gpu/drm/amd/amdgpu/si_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/si_ih.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
 #include "sid.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/si_smc.c b/drivers/gpu/drm/amd/amdgpu/si_smc.c
index 0726bc3b..4a2fd8b 100644
--- a/drivers/gpu/drm/amd/amdgpu/si_smc.c
+++ b/drivers/gpu/drm/amd/amdgpu/si_smc.c
@@ -23,7 +23,7 @@
  */
 
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "sid.h"
 #include "ppsmc.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 385de86..1da98e6 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -23,7 +23,7 @@
 #include <linux/firmware.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_atombios.h"
 #include "amdgpu_ih.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/tonga_ih.c b/drivers/gpu/drm/amd/amdgpu/tonga_ih.c
index 3a5097a..923df2c 100644
--- a/drivers/gpu/drm/amd/amdgpu/tonga_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/tonga_ih.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
 #include "vid.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
index 071f56e..3b9740f 100644
--- a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
 #include "soc15.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index b1132f5..3a18761 100644
--- a/drivers/gpu/drm/amd/amdgpu/vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
@@ -21,7 +21,7 @@
  *
  */
 #include <linux/slab.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_atombios.h"
 #include "amdgpu_ih.h"
diff --git a/drivers/gpu/drm/amd/amdkfd/Makefile b/drivers/gpu/drm/amd/amdkfd/Makefile
index 7fc9b0f..b400d56 100644
--- a/drivers/gpu/drm/amd/amdkfd/Makefile
+++ b/drivers/gpu/drm/amd/amdkfd/Makefile
@@ -2,7 +2,7 @@
 # Makefile for Heterogenous System Architecture support for AMD GPU devices
 #
 
-ccflags-y := -Iinclude/drm -Idrivers/gpu/drm/amd/include/  \
+ccflags-y := -Idrivers/gpu/drm/amd/include/  \
 		-Idrivers/gpu/drm/amd/include/asic_reg
 
 amdkfd-y	:= kfd_module.o kfd_device.o kfd_chardev.o kfd_topology.o \
diff --git a/drivers/gpu/drm/amd/powerplay/Makefile b/drivers/gpu/drm/amd/powerplay/Makefile
index 043e6eb..4e132b9 100644
--- a/drivers/gpu/drm/amd/powerplay/Makefile
+++ b/drivers/gpu/drm/amd/powerplay/Makefile
@@ -1,5 +1,5 @@
 
-subdir-ccflags-y += -Iinclude/drm  \
+subdir-ccflags-y += \
 		-I$(FULL_AMD_PATH)/powerplay/inc/  \
 		-I$(FULL_AMD_PATH)/include/asic_reg  \
 		-I$(FULL_AMD_PATH)/include  \
-- 
2.7.4

[PATCH v2 04/29] drm/ast: fix include notation and remove -Iinclude/drm flag

[Masahiro Yamada]

Include <drm/*.h> instead of relative path from include/drm, then
remove the -Iinclude/drm compiler flag.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2:
  - Sort the touched part alphabetically

 drivers/gpu/drm/ast/Makefile  | 2 --
 drivers/gpu/drm/ast/ast_ttm.c | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/ast/Makefile b/drivers/gpu/drm/ast/Makefile
index 171aa06..617fdd3 100644
--- a/drivers/gpu/drm/ast/Makefile
+++ b/drivers/gpu/drm/ast/Makefile
@@ -2,8 +2,6 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-ccflags-y := -Iinclude/drm
-
 ast-y := ast_drv.o ast_main.o ast_mode.o ast_fb.o ast_ttm.o ast_post.o ast_dp501.o
 
 obj-$(CONFIG_DRM_AST) := ast.o
diff --git a/drivers/gpu/drm/ast/ast_ttm.c b/drivers/gpu/drm/ast/ast_ttm.c
index e879496..5808498 100644
--- a/drivers/gpu/drm/ast/ast_ttm.c
+++ b/drivers/gpu/drm/ast/ast_ttm.c
@@ -26,8 +26,9 @@
  * Authors: Dave Airlie <airlied@redhat.com>
  */
 #include <drm/drmP.h>
+#include <drm/ttm/ttm_page_alloc.h>
+
 #include "ast_drv.h"
-#include <ttm/ttm_page_alloc.h>
 
 static inline struct ast_private *
 ast_bdev(struct ttm_bo_device *bd)
-- 
2.7.4

[PATCH v2 05/29] drm/bochs: fix include notation and remove -Iinclude/drm flag

[Masahiro Yamada]

Include <drm/*.h> instead of relative path from include/drm, then
remove the -Iinclude/drm compiler flag.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2: None

 drivers/gpu/drm/bochs/Makefile | 1 -
 drivers/gpu/drm/bochs/bochs.h  | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/bochs/Makefile b/drivers/gpu/drm/bochs/Makefile
index 844a556..98ef60a 100644
--- a/drivers/gpu/drm/bochs/Makefile
+++ b/drivers/gpu/drm/bochs/Makefile
@@ -1,4 +1,3 @@
-ccflags-y := -Iinclude/drm
 bochs-drm-y := bochs_drv.o bochs_mm.o bochs_kms.o bochs_fbdev.o bochs_hw.o
 
 obj-$(CONFIG_DRM_BOCHS)	+= bochs-drm.o
diff --git a/drivers/gpu/drm/bochs/bochs.h b/drivers/gpu/drm/bochs/bochs.h
index f626bab..76c490c 100644
--- a/drivers/gpu/drm/bochs/bochs.h
+++ b/drivers/gpu/drm/bochs/bochs.h
@@ -9,8 +9,8 @@
 
 #include <drm/drm_gem.h>
 
-#include <ttm/ttm_bo_driver.h>
-#include <ttm/ttm_page_alloc.h>
+#include <drm/ttm/ttm_bo_driver.h>
+#include <drm/ttm/ttm_page_alloc.h>
 
 /* ---------------------------------------------------------------------- */
 
-- 
2.7.4

[PATCH v2 06/29] drm/bridge: fix include notation and remove -Iinclude/drm flag

[Masahiro Yamada]

Include <drm/*.h> instead of relative path from include/drm, then
remove the -Iinclude/drm compiler flag.

While we are here, sort the touched parts alphabetically.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
---

Changes in v2:
  - Sort the includes alphabetically (Andrzej Hajda)

 drivers/gpu/drm/bridge/Makefile        |  2 --
 drivers/gpu/drm/bridge/nxp-ptn3460.c   | 12 +++++-------
 drivers/gpu/drm/bridge/parade-ps8622.c | 10 ++++------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile
index 3fe2226..defcf1e 100644
--- a/drivers/gpu/drm/bridge/Makefile
+++ b/drivers/gpu/drm/bridge/Makefile
@@ -1,5 +1,3 @@
-ccflags-y := -Iinclude/drm
-
 obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o
 obj-$(CONFIG_DRM_DUMB_VGA_DAC) += dumb-vga-dac.o
 obj-$(CONFIG_DRM_LVDS_ENCODER) += lvds-encoder.o
diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c
index 3517043..4f64e71 100644
--- a/drivers/gpu/drm/bridge/nxp-ptn3460.c
+++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c
@@ -20,15 +20,13 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
-
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_edid.h>
 #include <drm/drm_of.h>
 #include <drm/drm_panel.h>
-
-#include "drm_crtc.h"
-#include "drm_crtc_helper.h"
-#include "drm_atomic_helper.h"
-#include "drm_edid.h"
-#include "drmP.h"
+#include <drm/drmP.h>
 
 #define PTN3460_EDID_ADDR			0x0
 #define PTN3460_EDID_EMULATION_ADDR		0x84
diff --git a/drivers/gpu/drm/bridge/parade-ps8622.c b/drivers/gpu/drm/bridge/parade-ps8622.c
index 1dcec3b..6f22f9f 100644
--- a/drivers/gpu/drm/bridge/parade-ps8622.c
+++ b/drivers/gpu/drm/bridge/parade-ps8622.c
@@ -24,14 +24,12 @@
 #include <linux/of_device.h>
 #include <linux/pm.h>
 #include <linux/regulator/consumer.h>
-
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
 #include <drm/drm_of.h>
 #include <drm/drm_panel.h>
-
-#include "drmP.h"
-#include "drm_crtc.h"
-#include "drm_crtc_helper.h"
-#include "drm_atomic_helper.h"
+#include <drm/drmP.h>
 
 /* Brightness scale on the Parade chip */
 #define PS8622_MAX_BRIGHTNESS 0xff
-- 
2.7.4

[PATCH v2 07/29] drm/cirrus: fix include notation and remove -Iinclude/drm flag

[Masahiro Yamada]

Include <drm/*.h> instead of relative path from include/drm, then
remove the -Iinclude/drm compiler flag.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2:
  - Sort the touched part alphabetically

 drivers/gpu/drm/cirrus/Makefile     | 1 -
 drivers/gpu/drm/cirrus/cirrus_ttm.c | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/cirrus/Makefile b/drivers/gpu/drm/cirrus/Makefile
index 69ffe70..919c0a3 100644
--- a/drivers/gpu/drm/cirrus/Makefile
+++ b/drivers/gpu/drm/cirrus/Makefile
@@ -1,4 +1,3 @@
-ccflags-y := -Iinclude/drm
 cirrus-y  := cirrus_main.o cirrus_mode.o \
 	cirrus_drv.o cirrus_fbdev.o cirrus_ttm.o
 
diff --git a/drivers/gpu/drm/cirrus/cirrus_ttm.c b/drivers/gpu/drm/cirrus/cirrus_ttm.c
index 93dbcd3..1ff1838 100644
--- a/drivers/gpu/drm/cirrus/cirrus_ttm.c
+++ b/drivers/gpu/drm/cirrus/cirrus_ttm.c
@@ -26,8 +26,9 @@
  * Authors: Dave Airlie <airlied@redhat.com>
  */
 #include <drm/drmP.h>
+#include <drm/ttm/ttm_page_alloc.h>
+
 #include "cirrus_drv.h"
-#include <ttm/ttm_page_alloc.h>
 
 static inline struct cirrus_device *
 cirrus_bdev(struct ttm_bo_device *bd)
-- 
2.7.4

[PATCH v2 08/29] drm/hisilicon: fix include notation and remove -Iinclude/drm flag

[Masahiro Yamada]

Include <drm/*.h> instead of relative path from include/drm, then
remove the -Iinclude/drm compiler flag.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2: None

 drivers/gpu/drm/hisilicon/hibmc/Makefile    | 1 -
 drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/hisilicon/hibmc/Makefile b/drivers/gpu/drm/hisilicon/hibmc/Makefile
index f2e04c0..3df7266 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/Makefile
+++ b/drivers/gpu/drm/hisilicon/hibmc/Makefile
@@ -1,4 +1,3 @@
-ccflags-y := -Iinclude/drm
 hibmc-drm-y := hibmc_drm_drv.o hibmc_drm_de.o hibmc_drm_vdac.o hibmc_drm_fbdev.o hibmc_ttm.o
 
 obj-$(CONFIG_DRM_HISI_HIBMC) += hibmc-drm.o
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
index 20732b6..ac457c7 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
@@ -17,7 +17,7 @@
  */
 
 #include <drm/drm_atomic_helper.h>
-#include <ttm/ttm_page_alloc.h>
+#include <drm/ttm/ttm_page_alloc.h>
 
 #include "hibmc_drm_drv.h"
 
-- 
2.7.4

[PATCH v2 09/29] drm/mgag200: fix include notation and remove -Iinclude/drm flag

[Masahiro Yamada]

Include <drm/*.h> instead of relative path from include/drm, then
remove the -Iinclude/drm compiler flag.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2:
  - Sort the touched part alphabetically

 drivers/gpu/drm/mgag200/Makefile      | 1 -
 drivers/gpu/drm/mgag200/mgag200_ttm.c | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/mgag200/Makefile b/drivers/gpu/drm/mgag200/Makefile
index a9a0300..3d91d1d 100644
--- a/drivers/gpu/drm/mgag200/Makefile
+++ b/drivers/gpu/drm/mgag200/Makefile
@@ -1,4 +1,3 @@
-ccflags-y := -Iinclude/drm
 mgag200-y   := mgag200_main.o mgag200_mode.o mgag200_cursor.o \
 	mgag200_drv.o mgag200_fb.o mgag200_i2c.o mgag200_ttm.o
 
diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c b/drivers/gpu/drm/mgag200/mgag200_ttm.c
index 565a217..3e7e1cd 100644
--- a/drivers/gpu/drm/mgag200/mgag200_ttm.c
+++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c
@@ -26,8 +26,9 @@
  * Authors: Dave Airlie <airlied@redhat.com>
  */
 #include <drm/drmP.h>
+#include <drm/ttm/ttm_page_alloc.h>
+
 #include "mgag200_drv.h"
-#include <ttm/ttm_page_alloc.h>
 
 static inline struct mga_device *
 mgag200_bdev(struct ttm_bo_device *bd)
-- 
2.7.4

[PATCH v2 10/29] drm/msm: fix include notation and remove -Iinclude/drm flag

[Masahiro Yamada]

Include <drm/*.h> instead of relative path from include/drm, then
remove the -Iinclude/drm compiler flag.

While we are here, sort the touched parts with public headers first.
mdp4_kms.h must declare struct device_node to be self-contained.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2:
  - Sort includes

 drivers/gpu/drm/msm/Makefile                     |  2 +-
 drivers/gpu/drm/msm/dsi/dsi.h                    |  6 +++---
 drivers/gpu/drm/msm/edp/edp.h                    |  4 ++--
 drivers/gpu/drm/msm/edp/edp_ctrl.c               |  6 +++---
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c         | 10 +++++-----
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c  |  6 +++---
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c  |  7 +++----
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h          |  4 +++-
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c |  6 +++---
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c  |  6 +++---
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c         | 10 +++++-----
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c      |  6 +++---
 drivers/gpu/drm/msm/msm_fb.c                     |  6 +++---
 drivers/gpu/drm/msm/msm_fbdev.c                  |  6 +++---
 14 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile
index 5241ac8..33008fa 100644
--- a/drivers/gpu/drm/msm/Makefile
+++ b/drivers/gpu/drm/msm/Makefile
@@ -1,4 +1,4 @@
-ccflags-y := -Iinclude/drm -Idrivers/gpu/drm/msm
+ccflags-y := -Idrivers/gpu/drm/msm
 ccflags-$(CONFIG_DRM_MSM_DSI) += -Idrivers/gpu/drm/msm/dsi
 
 msm-y := \
diff --git a/drivers/gpu/drm/msm/dsi/dsi.h b/drivers/gpu/drm/msm/dsi/dsi.h
index 3236997..9e60173 100644
--- a/drivers/gpu/drm/msm/dsi/dsi.h
+++ b/drivers/gpu/drm/msm/dsi/dsi.h
@@ -17,9 +17,9 @@
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 
-#include "drm_crtc.h"
-#include "drm_mipi_dsi.h"
-#include "drm_panel.h"
+#include <drm/drm_crtc.h>
+#include <drm/drm_mipi_dsi.h>
+#include <drm/drm_panel.h>
 
 #include "msm_drv.h"
 
diff --git a/drivers/gpu/drm/msm/edp/edp.h b/drivers/gpu/drm/msm/edp/edp.h
index ba5bedd..e0f5818 100644
--- a/drivers/gpu/drm/msm/edp/edp.h
+++ b/drivers/gpu/drm/msm/edp/edp.h
@@ -18,9 +18,9 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_dp_helper.h>
 
-#include "drm_crtc.h"
-#include "drm_dp_helper.h"
 #include "msm_drv.h"
 
 #define edp_read(offset) msm_readl((offset))
diff --git a/drivers/gpu/drm/msm/edp/edp_ctrl.c b/drivers/gpu/drm/msm/edp/edp_ctrl.c
index 149bfe7..e32a4a4 100644
--- a/drivers/gpu/drm/msm/edp/edp_ctrl.c
+++ b/drivers/gpu/drm/msm/edp/edp_ctrl.c
@@ -14,10 +14,10 @@
 #include <linux/clk.h>
 #include <linux/gpio/consumer.h>
 #include <linux/regulator/consumer.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_dp_helper.h>
+#include <drm/drm_edid.h>
 
-#include "drm_crtc.h"
-#include "drm_dp_helper.h"
-#include "drm_edid.h"
 #include "edp.h"
 #include "edp.xml.h"
 
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
index f29194a..698e514 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
@@ -15,12 +15,12 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mdp4_kms.h"
-
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_flip_work.h>
 #include <drm/drm_mode.h>
-#include "drm_crtc.h"
-#include "drm_crtc_helper.h"
-#include "drm_flip_work.h"
+
+#include "mdp4_kms.h"
 
 struct mdp4_crtc {
 	struct drm_crtc base;
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c
index 106f0e7..6a1ebda 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c
@@ -17,10 +17,10 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mdp4_kms.h"
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
 
-#include "drm_crtc.h"
-#include "drm_crtc_helper.h"
+#include "mdp4_kms.h"
 
 struct mdp4_dsi_encoder {
 	struct drm_encoder base;
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c
index 24258e3..ba8e587 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c
@@ -15,11 +15,10 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mdp4_kms.h"
-
-#include "drm_crtc.h"
-#include "drm_crtc_helper.h"
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
 
+#include "mdp4_kms.h"
 
 struct mdp4_dtv_encoder {
 	struct drm_encoder base;
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h
index 62712ca..c413779 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h
@@ -18,12 +18,14 @@
 #ifndef __MDP4_KMS_H__
 #define __MDP4_KMS_H__
 
+#include <drm/drm_panel.h>
+
 #include "msm_drv.h"
 #include "msm_kms.h"
 #include "mdp/mdp_kms.h"
 #include "mdp4.xml.h"
 
-#include "drm_panel.h"
+struct device_node;
 
 struct mdp4_kms {
 	struct mdp_kms base;
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c
index a06b064..4a64592 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c
@@ -16,10 +16,10 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mdp4_kms.h"
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
 
-#include "drm_crtc.h"
-#include "drm_crtc_helper.h"
+#include "mdp4_kms.h"
 
 struct mdp4_lcdc_encoder {
 	struct drm_encoder base;
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c
index 8dafc7b..aa7402e 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c
@@ -11,10 +11,10 @@
  * GNU General Public License for more details.
  */
 
-#include "mdp5_kms.h"
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
 
-#include "drm_crtc.h"
-#include "drm_crtc_helper.h"
+#include "mdp5_kms.h"
 
 static struct mdp5_kms *get_kms(struct drm_encoder *encoder)
 {
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
index 9217e0d..0764a64 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
@@ -16,13 +16,13 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mdp5_kms.h"
-
 #include <linux/sort.h>
 #include <drm/drm_mode.h>
-#include "drm_crtc.h"
-#include "drm_crtc_helper.h"
-#include "drm_flip_work.h"
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_flip_work.h>
+
+#include "mdp5_kms.h"
 
 #define CURSOR_WIDTH	64
 #define CURSOR_HEIGHT	64
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c
index c2ab0f0..97f3294 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c
@@ -16,10 +16,10 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mdp5_kms.h"
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
 
-#include "drm_crtc.h"
-#include "drm_crtc_helper.h"
+#include "mdp5_kms.h"
 
 static struct mdp5_kms *get_kms(struct drm_encoder *encoder)
 {
diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c
index 5cf165c..ba2733a 100644
--- a/drivers/gpu/drm/msm/msm_fb.c
+++ b/drivers/gpu/drm/msm/msm_fb.c
@@ -15,12 +15,12 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+
 #include "msm_drv.h"
 #include "msm_kms.h"
 
-#include "drm_crtc.h"
-#include "drm_crtc_helper.h"
-
 struct msm_framebuffer {
 	struct drm_framebuffer base;
 	const struct msm_format *format;
diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c
index 951e40f..feea8ba 100644
--- a/drivers/gpu/drm/msm/msm_fbdev.c
+++ b/drivers/gpu/drm/msm/msm_fbdev.c
@@ -15,10 +15,10 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "msm_drv.h"
+#include <drm/drm_crtc.h>
+#include <drm/drm_fb_helper.h>
 
-#include "drm_crtc.h"
-#include "drm_fb_helper.h"
+#include "msm_drv.h"
 #include "msm_gem.h"
 
 extern int msm_gem_mmap_obj(struct drm_gem_object *obj,
-- 
2.7.4

[PATCH v2 11/29] drm/nouveau: fix include notation and remove -Iinclude/drm flag

[Masahiro Yamada]

Include <drm/*.h> instead of relative path from include/drm, then
remove the -Iinclude/drm compiler flag.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2: None

 drivers/gpu/drm/nouveau/Kbuild        | 1 -
 drivers/gpu/drm/nouveau/nouveau_drm.c | 4 ++--
 drivers/gpu/drm/nouveau/nouveau_drv.h | 2 +-
 drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/Kbuild b/drivers/gpu/drm/nouveau/Kbuild
index fde6e36..2e9ce53 100644
--- a/drivers/gpu/drm/nouveau/Kbuild
+++ b/drivers/gpu/drm/nouveau/Kbuild
@@ -1,4 +1,3 @@
-ccflags-y := -Iinclude/drm
 ccflags-y += -I$(src)/include
 ccflags-y += -I$(src)/include/nvkm
 ccflags-y += -I$(src)/nvkm
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 2b6ac24..301575c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -29,8 +29,8 @@
 #include <linux/pm_runtime.h>
 #include <linux/vga_switcheroo.h>
 
-#include "drmP.h"
-#include "drm_crtc_helper.h"
+#include <drm/drmP.h>
+#include <drm/drm_crtc_helper.h>
 
 #include <core/gpuobj.h>
 #include <core/option.h>
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index eadec2f..aaa2564 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -43,7 +43,7 @@
 #include <nvif/device.h>
 #include <nvif/ioctl.h>
 
-#include <drmP.h>
+#include <drm/drmP.h>
 
 #include <drm/ttm/ttm_bo_api.h>
 #include <drm/ttm/ttm_bo_driver.h>
diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
index 13e5cc5..999c35a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
@@ -28,7 +28,7 @@
 #include "nouveau_ttm.h"
 #include "nouveau_gem.h"
 
-#include "drm_legacy.h"
+#include <drm/drm_legacy.h>
 
 #include <core/tegra.h>
 
-- 
2.7.4

[PATCH v2 12/29] drm/qxl: fix include notation and remove -Iinclude/drm flag

[Masahiro Yamada]

Include <drm/*.h> instead of relative path from include/drm, then
remove the -Iinclude/drm compiler flag.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2:
  - Sort the touched parts

 drivers/gpu/drm/qxl/Makefile      |  2 --
 drivers/gpu/drm/qxl/qxl_debugfs.c |  2 +-
 drivers/gpu/drm/qxl/qxl_display.c |  9 ++++-----
 drivers/gpu/drm/qxl/qxl_drv.c     |  6 +++---
 drivers/gpu/drm/qxl/qxl_drv.h     | 18 ++++++++----------
 drivers/gpu/drm/qxl/qxl_fb.c      | 11 ++++++-----
 drivers/gpu/drm/qxl/qxl_gem.c     |  5 +++--
 drivers/gpu/drm/qxl/qxl_ttm.c     | 10 +++++-----
 8 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/drivers/gpu/drm/qxl/Makefile b/drivers/gpu/drm/qxl/Makefile
index bacc4af..33a7d0c 100644
--- a/drivers/gpu/drm/qxl/Makefile
+++ b/drivers/gpu/drm/qxl/Makefile
@@ -2,8 +2,6 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-ccflags-y := -Iinclude/drm
-
 qxl-y := qxl_drv.o qxl_kms.o qxl_display.o qxl_ttm.o qxl_fb.o qxl_object.o qxl_gem.o qxl_cmd.o qxl_image.o qxl_draw.o qxl_debugfs.o qxl_irq.o qxl_dumb.o qxl_ioctl.o qxl_release.o qxl_prime.o
 
 obj-$(CONFIG_DRM_QXL)+= qxl.o
diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
index ffe821b..15c8406 100644
--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
@@ -30,7 +30,7 @@
 
 #include <linux/debugfs.h>
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "qxl_drv.h"
 #include "qxl_object.h"
 
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index 058340a..f5ef815 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -23,16 +23,15 @@
  *          Alon Levy
  */
 
-
 #include <linux/crc32.h>
-
-#include "qxl_drv.h"
-#include "qxl_object.h"
-#include "drm_crtc_helper.h"
+#include <drm/drm_crtc_helper.h>
 #include <drm/drm_plane_helper.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_atomic.h>
 
+#include "qxl_drv.h"
+#include "qxl_object.h"
+
 static bool qxl_head_enabled(struct qxl_head *head)
 {
 	return head->width && head->height;
diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c
index abf7b83..c2fc201 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.c
+++ b/drivers/gpu/drm/qxl/qxl_drv.c
@@ -31,9 +31,9 @@
 #include <linux/module.h>
 #include <linux/console.h>
 
-#include "drmP.h"
-#include "drm/drm.h"
-#include "drm_crtc_helper.h"
+#include <drm/drmP.h>
+#include <drm/drm.h>
+#include <drm/drm_crtc_helper.h>
 #include "qxl_drv.h"
 #include "qxl_object.h"
 
diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
index 5ea290a..3591d23 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.h
+++ b/drivers/gpu/drm/qxl/qxl_drv.h
@@ -36,20 +36,18 @@
 #include <linux/firmware.h>
 #include <linux/platform_device.h>
 
-#include "drmP.h"
-#include "drm_crtc.h"
-#include <ttm/ttm_bo_api.h>
-#include <ttm/ttm_bo_driver.h>
-#include <ttm/ttm_placement.h>
-#include <ttm/ttm_module.h>
-
+#include <drm/drm_crtc.h>
 #include <drm/drm_encoder.h>
 #include <drm/drm_gem.h>
-
+#include <drm/drmP.h>
+#include <drm/ttm/ttm_bo_api.h>
+#include <drm/ttm/ttm_bo_driver.h>
 /* just for ttm_validate_buffer */
-#include <ttm/ttm_execbuf_util.h>
-
+#include <drm/ttm/ttm_execbuf_util.h>
+#include <drm/ttm/ttm_module.h>
+#include <drm/ttm/ttm_placement.h>
 #include <drm/qxl_drm.h>
+
 #include "qxl_dev.h"
 
 #define DRIVER_AUTHOR		"Dave Airlie"
diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c
index 14e2a49..573e7e9 100644
--- a/drivers/gpu/drm/qxl/qxl_fb.c
+++ b/drivers/gpu/drm/qxl/qxl_fb.c
@@ -25,14 +25,15 @@
  */
 #include <linux/module.h>
 
-#include "drmP.h"
-#include "drm/drm.h"
-#include "drm/drm_crtc.h"
-#include "drm/drm_crtc_helper.h"
+#include <drm/drmP.h>
+#include <drm/drm.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_fb_helper.h>
+
 #include "qxl_drv.h"
 
 #include "qxl_object.h"
-#include "drm_fb_helper.h"
 
 #define QXL_DIRTY_DELAY (HZ / 30)
 
diff --git a/drivers/gpu/drm/qxl/qxl_gem.c b/drivers/gpu/drm/qxl/qxl_gem.c
index 3f185c4..85f5467 100644
--- a/drivers/gpu/drm/qxl/qxl_gem.c
+++ b/drivers/gpu/drm/qxl/qxl_gem.c
@@ -23,8 +23,9 @@
  *          Alon Levy
  */
 
-#include "drmP.h"
-#include "drm/drm.h"
+#include <drm/drmP.h>
+#include <drm/drm.h>
+
 #include "qxl_drv.h"
 #include "qxl_object.h"
 
diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
index 0fdedee..87fc1db 100644
--- a/drivers/gpu/drm/qxl/qxl_ttm.c
+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
@@ -23,11 +23,11 @@
  *          Alon Levy
  */
 
-#include <ttm/ttm_bo_api.h>
-#include <ttm/ttm_bo_driver.h>
-#include <ttm/ttm_placement.h>
-#include <ttm/ttm_page_alloc.h>
-#include <ttm/ttm_module.h>
+#include <drm/ttm/ttm_bo_api.h>
+#include <drm/ttm/ttm_bo_driver.h>
+#include <drm/ttm/ttm_placement.h>
+#include <drm/ttm/ttm_page_alloc.h>
+#include <drm/ttm/ttm_module.h>
 #include <drm/drmP.h>
 #include <drm/drm.h>
 #include <drm/qxl_drm.h>
-- 
2.7.4

[PATCH v2 13/29] drm/radeon: fix include notation and remove -Iinclude/drm flag

[Masahiro Yamada]

Include <drm/*.h> instead of relative path from include/drm, then
remove the -Iinclude/drm compiler flag.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
---

Changes in v2: None

 drivers/gpu/drm/radeon/Makefile      |  2 +-
 drivers/gpu/drm/radeon/btc_dpm.c     |  2 +-
 drivers/gpu/drm/radeon/ci_dpm.c      |  2 +-
 drivers/gpu/drm/radeon/ci_smc.c      |  2 +-
 drivers/gpu/drm/radeon/cik.c         |  2 +-
 drivers/gpu/drm/radeon/cypress_dpm.c |  2 +-
 drivers/gpu/drm/radeon/kv_dpm.c      |  2 +-
 drivers/gpu/drm/radeon/kv_smc.c      |  2 +-
 drivers/gpu/drm/radeon/ni_dpm.c      |  2 +-
 drivers/gpu/drm/radeon/r600_dpm.c    |  2 +-
 drivers/gpu/drm/radeon/radeon.h      | 10 +++++-----
 drivers/gpu/drm/radeon/radeon_drv.c  |  2 +-
 drivers/gpu/drm/radeon/radeon_ttm.c  | 10 +++++-----
 drivers/gpu/drm/radeon/rs780_dpm.c   |  2 +-
 drivers/gpu/drm/radeon/rv6xx_dpm.c   |  2 +-
 drivers/gpu/drm/radeon/rv730_dpm.c   |  2 +-
 drivers/gpu/drm/radeon/rv740_dpm.c   |  2 +-
 drivers/gpu/drm/radeon/rv770_dpm.c   |  2 +-
 drivers/gpu/drm/radeon/rv770_smc.c   |  2 +-
 drivers/gpu/drm/radeon/si_dpm.c      |  2 +-
 drivers/gpu/drm/radeon/si_smc.c      |  2 +-
 drivers/gpu/drm/radeon/sumo_dpm.c    |  2 +-
 drivers/gpu/drm/radeon/sumo_smc.c    |  2 +-
 drivers/gpu/drm/radeon/trinity_dpm.c |  2 +-
 drivers/gpu/drm/radeon/trinity_smc.c |  2 +-
 25 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile
index 08bd17d..a5d3cd3 100644
--- a/drivers/gpu/drm/radeon/Makefile
+++ b/drivers/gpu/drm/radeon/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-ccflags-y := -Iinclude/drm -Idrivers/gpu/drm/amd/include
+ccflags-y := -Idrivers/gpu/drm/amd/include
 
 hostprogs-y := mkregtable
 clean-files := rn50_reg_safe.h r100_reg_safe.h r200_reg_safe.h rv515_reg_safe.h r300_reg_safe.h r420_reg_safe.h rs600_reg_safe.h r600_reg_safe.h evergreen_reg_safe.h cayman_reg_safe.h
diff --git a/drivers/gpu/drm/radeon/btc_dpm.c b/drivers/gpu/drm/radeon/btc_dpm.c
index 38e5123..95652e6 100644
--- a/drivers/gpu/drm/radeon/btc_dpm.c
+++ b/drivers/gpu/drm/radeon/btc_dpm.c
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "btcd.h"
diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c
index 7ba4508..f0cf997 100644
--- a/drivers/gpu/drm/radeon/ci_dpm.c
+++ b/drivers/gpu/drm/radeon/ci_dpm.c
@@ -22,7 +22,7 @@
  */
 
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "radeon_ucode.h"
diff --git a/drivers/gpu/drm/radeon/ci_smc.c b/drivers/gpu/drm/radeon/ci_smc.c
index 24760ee..3356a21 100644
--- a/drivers/gpu/drm/radeon/ci_smc.c
+++ b/drivers/gpu/drm/radeon/ci_smc.c
@@ -23,7 +23,7 @@
  */
 
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "cikd.h"
 #include "ppsmc.h"
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index 53710dd..e0db246 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -24,7 +24,7 @@
 #include <linux/firmware.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "radeon_audio.h"
diff --git a/drivers/gpu/drm/radeon/cypress_dpm.c b/drivers/gpu/drm/radeon/cypress_dpm.c
index a4edd07..3eb7899 100644
--- a/drivers/gpu/drm/radeon/cypress_dpm.c
+++ b/drivers/gpu/drm/radeon/cypress_dpm.c
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "evergreend.h"
diff --git a/drivers/gpu/drm/radeon/kv_dpm.c b/drivers/gpu/drm/radeon/kv_dpm.c
index a7e9786..ae1529b 100644
--- a/drivers/gpu/drm/radeon/kv_dpm.c
+++ b/drivers/gpu/drm/radeon/kv_dpm.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "cikd.h"
 #include "r600_dpm.h"
diff --git a/drivers/gpu/drm/radeon/kv_smc.c b/drivers/gpu/drm/radeon/kv_smc.c
index 0000b59..af60bd3 100644
--- a/drivers/gpu/drm/radeon/kv_smc.c
+++ b/drivers/gpu/drm/radeon/kv_smc.c
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "cikd.h"
 #include "kv_dpm.h"
diff --git a/drivers/gpu/drm/radeon/ni_dpm.c b/drivers/gpu/drm/radeon/ni_dpm.c
index 4a601f9..9416e72 100644
--- a/drivers/gpu/drm/radeon/ni_dpm.c
+++ b/drivers/gpu/drm/radeon/ni_dpm.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "nid.h"
diff --git a/drivers/gpu/drm/radeon/r600_dpm.c b/drivers/gpu/drm/radeon/r600_dpm.c
index c7fc1db..31d1b47 100644
--- a/drivers/gpu/drm/radeon/r600_dpm.c
+++ b/drivers/gpu/drm/radeon/r600_dpm.c
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "r600d.h"
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index c1c8e22..342e3b1 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -68,11 +68,11 @@
 #include <linux/hashtable.h>
 #include <linux/dma-fence.h>
 
-#include <ttm/ttm_bo_api.h>
-#include <ttm/ttm_bo_driver.h>
-#include <ttm/ttm_placement.h>
-#include <ttm/ttm_module.h>
-#include <ttm/ttm_execbuf_util.h>
+#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_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 93d45aa..581b1fd 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -41,7 +41,7 @@
 #include <drm/drm_gem.h>
 #include <drm/drm_fb_helper.h>
 
-#include "drm_crtc_helper.h"
+#include <drm/drm_crtc_helper.h>
 #include "radeon_kfd.h"
 
 /*
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 8b7623b..faa0213 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -29,11 +29,11 @@
  *    Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
  *    Dave Airlie
  */
-#include <ttm/ttm_bo_api.h>
-#include <ttm/ttm_bo_driver.h>
-#include <ttm/ttm_placement.h>
-#include <ttm/ttm_module.h>
-#include <ttm/ttm_page_alloc.h>
+#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_page_alloc.h>
 #include <drm/drmP.h>
 #include <drm/radeon_drm.h>
 #include <linux/seq_file.h>
diff --git a/drivers/gpu/drm/radeon/rs780_dpm.c b/drivers/gpu/drm/radeon/rs780_dpm.c
index 94b48fc..b5e4e09 100644
--- a/drivers/gpu/drm/radeon/rs780_dpm.c
+++ b/drivers/gpu/drm/radeon/rs780_dpm.c
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "rs780d.h"
diff --git a/drivers/gpu/drm/radeon/rv6xx_dpm.c b/drivers/gpu/drm/radeon/rv6xx_dpm.c
index 25e2930..d91aa39 100644
--- a/drivers/gpu/drm/radeon/rv6xx_dpm.c
+++ b/drivers/gpu/drm/radeon/rv6xx_dpm.c
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "rv6xxd.h"
diff --git a/drivers/gpu/drm/radeon/rv730_dpm.c b/drivers/gpu/drm/radeon/rv730_dpm.c
index d37ba2c..38fdb41 100644
--- a/drivers/gpu/drm/radeon/rv730_dpm.c
+++ b/drivers/gpu/drm/radeon/rv730_dpm.c
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "rv730d.h"
 #include "r600_dpm.h"
diff --git a/drivers/gpu/drm/radeon/rv740_dpm.c b/drivers/gpu/drm/radeon/rv740_dpm.c
index 4b85082..afd597e 100644
--- a/drivers/gpu/drm/radeon/rv740_dpm.c
+++ b/drivers/gpu/drm/radeon/rv740_dpm.c
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "rv740d.h"
 #include "r600_dpm.h"
diff --git a/drivers/gpu/drm/radeon/rv770_dpm.c b/drivers/gpu/drm/radeon/rv770_dpm.c
index a010dec..cb2a7ec 100644
--- a/drivers/gpu/drm/radeon/rv770_dpm.c
+++ b/drivers/gpu/drm/radeon/rv770_dpm.c
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "rv770d.h"
diff --git a/drivers/gpu/drm/radeon/rv770_smc.c b/drivers/gpu/drm/radeon/rv770_smc.c
index b2a2244..2b7ddee 100644
--- a/drivers/gpu/drm/radeon/rv770_smc.c
+++ b/drivers/gpu/drm/radeon/rv770_smc.c
@@ -23,7 +23,7 @@
  */
 
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "rv770d.h"
 #include "rv770_dpm.h"
diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c
index c7af9fd..ee3e742 100644
--- a/drivers/gpu/drm/radeon/si_dpm.c
+++ b/drivers/gpu/drm/radeon/si_dpm.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "sid.h"
diff --git a/drivers/gpu/drm/radeon/si_smc.c b/drivers/gpu/drm/radeon/si_smc.c
index e5bb92f..51155ab 100644
--- a/drivers/gpu/drm/radeon/si_smc.c
+++ b/drivers/gpu/drm/radeon/si_smc.c
@@ -23,7 +23,7 @@
  */
 
 #include <linux/firmware.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "sid.h"
 #include "ppsmc.h"
diff --git a/drivers/gpu/drm/radeon/sumo_dpm.c b/drivers/gpu/drm/radeon/sumo_dpm.c
index f0d5c17..fd48048 100644
--- a/drivers/gpu/drm/radeon/sumo_dpm.c
+++ b/drivers/gpu/drm/radeon/sumo_dpm.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "sumod.h"
diff --git a/drivers/gpu/drm/radeon/sumo_smc.c b/drivers/gpu/drm/radeon/sumo_smc.c
index fb081d2..cc051be 100644
--- a/drivers/gpu/drm/radeon/sumo_smc.c
+++ b/drivers/gpu/drm/radeon/sumo_smc.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "sumod.h"
 #include "sumo_dpm.h"
diff --git a/drivers/gpu/drm/radeon/trinity_dpm.c b/drivers/gpu/drm/radeon/trinity_dpm.c
index 6730367..2ef7c4e 100644
--- a/drivers/gpu/drm/radeon/trinity_dpm.c
+++ b/drivers/gpu/drm/radeon/trinity_dpm.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "trinityd.h"
diff --git a/drivers/gpu/drm/radeon/trinity_smc.c b/drivers/gpu/drm/radeon/trinity_smc.c
index 99dd045..0310e36 100644
--- a/drivers/gpu/drm/radeon/trinity_smc.c
+++ b/drivers/gpu/drm/radeon/trinity_smc.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "radeon.h"
 #include "trinityd.h"
 #include "trinity_dpm.h"
-- 
2.7.4

[PATCH v2 14/29] drm/tilcdc: fix include notation and remove -Iinclude/drm flag

[Masahiro Yamada]

Include <drm/*.h> instead of relative path from include/drm, then
remove the -Iinclude/drm compiler flag.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2: None

 drivers/gpu/drm/tilcdc/Makefile     | 1 -
 drivers/gpu/drm/tilcdc/tilcdc_drv.c | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/tilcdc/Makefile b/drivers/gpu/drm/tilcdc/Makefile
index 6f67517..55ebd51 100644
--- a/drivers/gpu/drm/tilcdc/Makefile
+++ b/drivers/gpu/drm/tilcdc/Makefile
@@ -1,4 +1,3 @@
-ccflags-y := -Iinclude/drm
 ifeq (, $(findstring -W,$(EXTRA_CFLAGS)))
 	ccflags-y += -Werror
 endif
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
index d7ae5be..d67e189 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
@@ -22,6 +22,7 @@
 #include <linux/suspend.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_fb_helper.h>
 
 #include "tilcdc_drv.h"
 #include "tilcdc_regs.h"
@@ -29,8 +30,6 @@
 #include "tilcdc_panel.h"
 #include "tilcdc_external.h"
 
-#include "drm_fb_helper.h"
-
 static LIST_HEAD(module_list);
 
 static const u32 tilcdc_rev1_formats[] = { DRM_FORMAT_RGB565 };
-- 
2.7.4

[PATCH v2 15/29] drm/vc4: fix include notation and remove -Iinclude/drm flag

[Masahiro Yamada]

Include <drm/*.h> instead of relative path from include/drm, then
remove the -Iinclude/drm compiler flag.

While we are here, use <...> instead of "..." for include/linux/*.h
headers too.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2: None

 drivers/gpu/drm/vc4/Makefile    |  2 --
 drivers/gpu/drm/vc4/vc4_crtc.c  | 14 +++++++-------
 drivers/gpu/drm/vc4/vc4_dpi.c   | 16 ++++++++--------
 drivers/gpu/drm/vc4/vc4_drv.c   |  2 +-
 drivers/gpu/drm/vc4/vc4_drv.h   |  5 ++---
 drivers/gpu/drm/vc4/vc4_dsi.c   | 28 ++++++++++++++--------------
 drivers/gpu/drm/vc4/vc4_hdmi.c  | 20 ++++++++++----------
 drivers/gpu/drm/vc4/vc4_hvs.c   |  2 +-
 drivers/gpu/drm/vc4/vc4_kms.c   | 12 ++++++------
 drivers/gpu/drm/vc4/vc4_plane.c |  9 +++++----
 drivers/gpu/drm/vc4/vc4_v3d.c   |  4 ++--
 11 files changed, 56 insertions(+), 58 deletions(-)

diff --git a/drivers/gpu/drm/vc4/Makefile b/drivers/gpu/drm/vc4/Makefile
index 61f45d1..f0efc7eb 100644
--- a/drivers/gpu/drm/vc4/Makefile
+++ b/drivers/gpu/drm/vc4/Makefile
@@ -1,5 +1,3 @@
-ccflags-y := -Iinclude/drm
-
 # Please keep these build lists sorted!
 
 # core driver code
diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
index d86c8cc..34d2e8a 100644
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
@@ -32,13 +32,13 @@
  * ones that set the clock.
  */
 
-#include "drm_atomic.h"
-#include "drm_atomic_helper.h"
-#include "drm_crtc_helper.h"
-#include "linux/clk.h"
-#include "drm_fb_cma_helper.h"
-#include "linux/component.h"
-#include "linux/of_device.h"
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc_helper.h>
+#include <linux/clk.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <linux/component.h>
+#include <linux/of_device.h>
 #include "vc4_drv.h"
 #include "vc4_regs.h"
 
diff --git a/drivers/gpu/drm/vc4/vc4_dpi.c b/drivers/gpu/drm/vc4/vc4_dpi.c
index c6d7039..39d6808 100644
--- a/drivers/gpu/drm/vc4/vc4_dpi.c
+++ b/drivers/gpu/drm/vc4/vc4_dpi.c
@@ -22,14 +22,14 @@
  * ALT2 function.
  */
 
-#include "drm_atomic_helper.h"
-#include "drm_crtc_helper.h"
-#include "drm_edid.h"
-#include "drm_panel.h"
-#include "linux/clk.h"
-#include "linux/component.h"
-#include "linux/of_graph.h"
-#include "linux/of_platform.h"
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_edid.h>
+#include <drm/drm_panel.h>
+#include <linux/clk.h>
+#include <linux/component.h>
+#include <linux/of_graph.h>
+#include <linux/of_platform.h>
 #include "vc4_drv.h"
 #include "vc4_regs.h"
 
diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
index 61e674b..2037a5f 100644
--- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -31,7 +31,7 @@
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
-#include "drm_fb_cma_helper.h"
+#include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_fb_helper.h>
 
 #include "uapi/drm/vc4_drm.h"
diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
index dffce629..ebfef52 100644
--- a/drivers/gpu/drm/vc4/vc4_drv.h
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
@@ -6,10 +6,9 @@
  * published by the Free Software Foundation.
  */
 
-#include "drmP.h"
-#include "drm_gem_cma_helper.h"
-
+#include <drm/drmP.h>
 #include <drm/drm_encoder.h>
+#include <drm/drm_gem_cma_helper.h>
 
 struct vc4_dev {
 	struct drm_device *dev;
diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c
index 160f981..d18c9b1 100644
--- a/drivers/gpu/drm/vc4/vc4_dsi.c
+++ b/drivers/gpu/drm/vc4/vc4_dsi.c
@@ -29,20 +29,20 @@
  * hopefully present.
  */
 
-#include "drm_atomic_helper.h"
-#include "drm_crtc_helper.h"
-#include "drm_edid.h"
-#include "drm_mipi_dsi.h"
-#include "drm_panel.h"
-#include "linux/clk.h"
-#include "linux/clk-provider.h"
-#include "linux/completion.h"
-#include "linux/component.h"
-#include "linux/dmaengine.h"
-#include "linux/i2c.h"
-#include "linux/of_address.h"
-#include "linux/of_platform.h"
-#include "linux/pm_runtime.h"
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_edid.h>
+#include <drm/drm_mipi_dsi.h>
+#include <drm/drm_panel.h>
+#include <linux/clk.h>
+#include <linux/clk-provider.h>
+#include <linux/completion.h>
+#include <linux/component.h>
+#include <linux/dmaengine.h>
+#include <linux/i2c.h>
+#include <linux/of_address.h>
+#include <linux/of_platform.h>
+#include <linux/pm_runtime.h>
 #include "vc4_drv.h"
 #include "vc4_regs.h"
 
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index e9cbe26..c91591c 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -42,16 +42,16 @@
  * encoder block has CEC support.
  */
 
-#include "drm_atomic_helper.h"
-#include "drm_crtc_helper.h"
-#include "drm_edid.h"
-#include "linux/clk.h"
-#include "linux/component.h"
-#include "linux/i2c.h"
-#include "linux/of_address.h"
-#include "linux/of_gpio.h"
-#include "linux/of_platform.h"
-#include "linux/rational.h"
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_edid.h>
+#include <linux/clk.h>
+#include <linux/component.h>
+#include <linux/i2c.h>
+#include <linux/of_address.h>
+#include <linux/of_gpio.h>
+#include <linux/of_platform.h>
+#include <linux/rational.h>
 #include "sound/dmaengine_pcm.h"
 #include "sound/pcm_drm_eld.h"
 #include "sound/pcm_params.h"
diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c
index fd421ba..2b62fc5 100644
--- a/drivers/gpu/drm/vc4/vc4_hvs.c
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
@@ -22,7 +22,7 @@
  * each CRTC.
  */
 
-#include "linux/component.h"
+#include <linux/component.h>
 #include "vc4_drv.h"
 #include "vc4_regs.h"
 
diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
index ad7925a..3f2e64e 100644
--- a/drivers/gpu/drm/vc4/vc4_kms.c
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
@@ -14,12 +14,12 @@
  * crtc, HDMI encoder).
  */
 
-#include "drm_crtc.h"
-#include "drm_atomic.h"
-#include "drm_atomic_helper.h"
-#include "drm_crtc_helper.h"
-#include "drm_plane_helper.h"
-#include "drm_fb_cma_helper.h"
+#include <drm/drm_crtc.h>
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_plane_helper.h>
+#include <drm/drm_fb_cma_helper.h>
 #include "vc4_drv.h"
 
 static void vc4_output_poll_changed(struct drm_device *dev)
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
index d34cd53..da18dec 100644
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
@@ -18,12 +18,13 @@
  * into the region of the HVS that it has allocated for us.
  */
 
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_plane_helper.h>
+
 #include "vc4_drv.h"
 #include "vc4_regs.h"
-#include "drm_atomic.h"
-#include "drm_atomic_helper.h"
-#include "drm_fb_cma_helper.h"
-#include "drm_plane_helper.h"
 
 enum vc4_scaling_mode {
 	VC4_SCALING_NONE,
diff --git a/drivers/gpu/drm/vc4/vc4_v3d.c b/drivers/gpu/drm/vc4/vc4_v3d.c
index 7cc346a..b0f223f 100644
--- a/drivers/gpu/drm/vc4/vc4_v3d.c
+++ b/drivers/gpu/drm/vc4/vc4_v3d.c
@@ -16,8 +16,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "linux/component.h"
-#include "linux/pm_runtime.h"
+#include <linux/component.h>
+#include <linux/pm_runtime.h>
 #include "vc4_drv.h"
 #include "vc4_regs.h"
 
-- 
2.7.4

[PATCH v2 16/29] drm/virtio: fix include notation and remove -Iinclude/drm flag

[Masahiro Yamada]

Include <drm/*.h> instead of relative path from include/drm, then
remove the -Iinclude/drm compiler flag.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2: None

 drivers/gpu/drm/virtio/Makefile          |  2 --
 drivers/gpu/drm/virtio/virtgpu_debugfs.c |  2 +-
 drivers/gpu/drm/virtio/virtgpu_drv.c     |  4 ++--
 drivers/gpu/drm/virtio/virtgpu_drv.h     |  8 ++++----
 drivers/gpu/drm/virtio/virtgpu_ioctl.c   |  5 +++--
 drivers/gpu/drm/virtio/virtgpu_ttm.c     | 10 +++++-----
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/virtio/Makefile b/drivers/gpu/drm/virtio/Makefile
index 3fb8eac..7684f61 100644
--- a/drivers/gpu/drm/virtio/Makefile
+++ b/drivers/gpu/drm/virtio/Makefile
@@ -2,8 +2,6 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-ccflags-y := -Iinclude/drm
-
 virtio-gpu-y := virtgpu_drv.o virtgpu_kms.o virtgpu_drm_bus.o virtgpu_gem.o \
 	virtgpu_fb.o virtgpu_display.o virtgpu_vq.o virtgpu_ttm.o \
 	virtgpu_fence.o virtgpu_object.o virtgpu_debugfs.o virtgpu_plane.o \
diff --git a/drivers/gpu/drm/virtio/virtgpu_debugfs.c b/drivers/gpu/drm/virtio/virtgpu_debugfs.c
index f51240a..73dc990 100644
--- a/drivers/gpu/drm/virtio/virtgpu_debugfs.c
+++ b/drivers/gpu/drm/virtio/virtgpu_debugfs.c
@@ -24,8 +24,8 @@
  */
 
 #include <linux/debugfs.h>
+#include <drm/drmP.h>
 
-#include "drmP.h"
 #include "virtgpu_drv.h"
 
 static int
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c
index 2d29b01..63d35c7 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drv.c
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.c
@@ -29,8 +29,8 @@
 #include <linux/module.h>
 #include <linux/console.h>
 #include <linux/pci.h>
-#include "drmP.h"
-#include "drm/drm.h"
+#include <drm/drmP.h>
+#include <drm/drm.h>
 
 #include "virtgpu_drv.h"
 static struct drm_driver driver;
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h
index 1328185..3a66abb 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drv.h
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
@@ -36,10 +36,10 @@
 #include <drm/drm_atomic.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_encoder.h>
-#include <ttm/ttm_bo_api.h>
-#include <ttm/ttm_bo_driver.h>
-#include <ttm/ttm_placement.h>
-#include <ttm/ttm_module.h>
+#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>
 
 #define DRIVER_NAME "virtio_gpu"
 #define DRIVER_DESC "virtio GPU"
diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index 61f3a96..06cb16d 100644
--- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@ -26,9 +26,10 @@
  */
 
 #include <drm/drmP.h>
-#include "virtgpu_drv.h"
 #include <drm/virtgpu_drm.h>
-#include "ttm/ttm_execbuf_util.h"
+#include <drm/ttm/ttm_execbuf_util.h>
+
+#include "virtgpu_drv.h"
 
 static void convert_to_hw_box(struct virtio_gpu_box *dst,
 			      const struct drm_virtgpu_3d_box *src)
diff --git a/drivers/gpu/drm/virtio/virtgpu_ttm.c b/drivers/gpu/drm/virtio/virtgpu_ttm.c
index 4e8e27d..c1f2af4 100644
--- a/drivers/gpu/drm/virtio/virtgpu_ttm.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ttm.c
@@ -25,11 +25,11 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <ttm/ttm_bo_api.h>
-#include <ttm/ttm_bo_driver.h>
-#include <ttm/ttm_placement.h>
-#include <ttm/ttm_page_alloc.h>
-#include <ttm/ttm_module.h>
+#include <drm/ttm/ttm_bo_api.h>
+#include <drm/ttm/ttm_bo_driver.h>
+#include <drm/ttm/ttm_placement.h>
+#include <drm/ttm/ttm_page_alloc.h>
+#include <drm/ttm/ttm_module.h>
 #include <drm/drmP.h>
 #include <drm/drm.h>
 #include <drm/virtgpu_drm.h>
-- 
2.7.4

[PATCH v2 17/29] drm/vmwgfx: fix include notation and remove -Iinclude/drm flag

[Masahiro Yamada]

Include <drm/*.h> instead of relative path from include/drm, then
remove the -Iinclude/drm compiler flag.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2: None

 drivers/gpu/drm/vmwgfx/Makefile         | 3 ---
 drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c  | 3 ++-
 drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 3 ++-
 drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 3 ++-
 drivers/gpu/drm/vmwgfx/vmwgfx_msg.c     | 2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_shader.c  | 3 ++-
 drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 3 ++-
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/vmwgfx/Makefile b/drivers/gpu/drm/vmwgfx/Makefile
index aac17a6..a365330 100644
--- a/drivers/gpu/drm/vmwgfx/Makefile
+++ b/drivers/gpu/drm/vmwgfx/Makefile
@@ -1,6 +1,3 @@
-
-ccflags-y := -Iinclude/drm
-
 vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_kms.o vmwgfx_drv.o \
 	    vmwgfx_fb.o vmwgfx_ioctl.o vmwgfx_resource.o vmwgfx_buffer.o \
 	    vmwgfx_fifo.o vmwgfx_irq.o vmwgfx_ldu.o vmwgfx_ttm_glue.o \
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
index 77cb7c6..99a7f4a 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
@@ -25,8 +25,9 @@
  *
  **************************************************************************/
 
+#include <drm/ttm/ttm_bo_api.h>
+
 #include "vmwgfx_drv.h"
-#include "ttm/ttm_bo_api.h"
 
 /*
  * Size of inline command buffers. Try to make sure that a page size is a
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
index 443d1ed..bcc6d41 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
@@ -25,10 +25,11 @@
  *
  **************************************************************************/
 
+#include <drm/ttm/ttm_placement.h>
+
 #include "vmwgfx_drv.h"
 #include "vmwgfx_resource_priv.h"
 #include "vmwgfx_binding.h"
-#include "ttm/ttm_placement.h"
 
 struct vmw_user_context {
 	struct ttm_base_object base;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c
index 265c81e..6c026d7 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c
@@ -30,9 +30,10 @@
  * whenever the backing MOB is evicted.
  */
 
+#include <drm/ttm/ttm_placement.h>
+
 #include "vmwgfx_drv.h"
 #include "vmwgfx_resource_priv.h"
-#include <ttm/ttm_placement.h>
 #include "vmwgfx_so.h"
 
 /**
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
index e57a0ba..6063c96 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
@@ -30,7 +30,7 @@
 #include <linux/kernel.h>
 #include <linux/frame.h>
 #include <asm/hypervisor.h>
-#include "drmP.h"
+#include <drm/drmP.h>
 #include "vmwgfx_msg.h"
 
 
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_shader.c b/drivers/gpu/drm/vmwgfx/vmwgfx_shader.c
index 92f8b1d..68f135c 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_shader.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_shader.c
@@ -25,10 +25,11 @@
  *
  **************************************************************************/
 
+#include <drm/ttm/ttm_placement.h>
+
 #include "vmwgfx_drv.h"
 #include "vmwgfx_resource_priv.h"
 #include "vmwgfx_binding.h"
-#include "ttm/ttm_placement.h"
 
 struct vmw_shader {
 	struct vmw_resource res;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
index 7681341..5900cff 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
@@ -25,11 +25,12 @@
  *
  **************************************************************************/
 
+#include <drm/ttm/ttm_placement.h>
+
 #include "vmwgfx_drv.h"
 #include "vmwgfx_resource_priv.h"
 #include "vmwgfx_so.h"
 #include "vmwgfx_binding.h"
-#include <ttm/ttm_placement.h>
 #include "device_include/svga3d_surfacedefs.h"
 
 
-- 
2.7.4

[PATCH v2 18/29] drm/gma500: remove unneeded -Iinclude/drm compiler flag

[Masahiro Yamada]

With the include directives under include/drm/ fixed, this flag is
no longer needed.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2: None

 drivers/gpu/drm/gma500/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/gma500/Makefile b/drivers/gpu/drm/gma500/Makefile
index 190e55f..c1c8dc1 100644
--- a/drivers/gpu/drm/gma500/Makefile
+++ b/drivers/gpu/drm/gma500/Makefile
@@ -1,7 +1,6 @@
 #
 #	KMS driver for the GMA500
 #
-ccflags-y += -I$(srctree)/include/drm
 
 gma500_gfx-y += \
 	  accel_2d.o \
-- 
2.7.4

[PATCH v2 19/29] drm/i810: remove unneeded -Iinclude/drm compiler flag

[Masahiro Yamada]

With the include directives under include/drm/ fixed, this flag is
no longer needed.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2: None

 drivers/gpu/drm/i810/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/i810/Makefile b/drivers/gpu/drm/i810/Makefile
index 43844ec..639f859 100644
--- a/drivers/gpu/drm/i810/Makefile
+++ b/drivers/gpu/drm/i810/Makefile
@@ -2,7 +2,6 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-ccflags-y := -Iinclude/drm
 i810-y := i810_drv.o i810_dma.o
 
 obj-$(CONFIG_DRM_I810)	+= i810.o
-- 
2.7.4

[PATCH v2 20/29] drm/i2c: remove unneeded -Iinclude/drm compiler flag

[Masahiro Yamada]

With the include directives under include/drm/ fixed, this flag is
no longer needed.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2: None

 drivers/gpu/drm/i2c/Makefile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/gpu/drm/i2c/Makefile b/drivers/gpu/drm/i2c/Makefile
index 43aa33b..a77acfc 100644
--- a/drivers/gpu/drm/i2c/Makefile
+++ b/drivers/gpu/drm/i2c/Makefile
@@ -1,5 +1,3 @@
-ccflags-y := -Iinclude/drm
-
 ch7006-y := ch7006_drv.o ch7006_mode.o
 obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o
 
-- 
2.7.4

[PATCH v2 21/29] drm/mga: remove unneeded -Iinclude/drm compiler flag

[Masahiro Yamada]

With the include directives under include/drm/ fixed, this flag is
no longer needed.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2: None

 drivers/gpu/drm/mga/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/mga/Makefile b/drivers/gpu/drm/mga/Makefile
index 6068478..49e972c 100644
--- a/drivers/gpu/drm/mga/Makefile
+++ b/drivers/gpu/drm/mga/Makefile
@@ -2,7 +2,6 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-ccflags-y := -Iinclude/drm
 mga-y := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o
 
 mga-$(CONFIG_COMPAT) += mga_ioc32.o
-- 
2.7.4

[PATCH v2 22/29] drm/omap: remove unneeded -Iinclude/drm compiler flag

[Masahiro Yamada]

With the include directives under include/drm/ fixed, this flag is
no longer needed.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2: None

 drivers/gpu/drm/omapdrm/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/omapdrm/Makefile b/drivers/gpu/drm/omapdrm/Makefile
index 48b7b75..b391be7 100644
--- a/drivers/gpu/drm/omapdrm/Makefile
+++ b/drivers/gpu/drm/omapdrm/Makefile
@@ -6,7 +6,6 @@
 obj-y += dss/
 obj-y += displays/
 
-ccflags-y := -Iinclude/drm
 omapdrm-y := omap_drv.o \
 	omap_irq.o \
 	omap_debugfs.o \
-- 
2.7.4

[PATCH v2 23/29] drm/r128: remove unneeded -Iinclude/drm compiler flag

[Masahiro Yamada]

With the include directives under include/drm/ fixed, this flag is
no longer needed.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2: None

 drivers/gpu/drm/r128/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/r128/Makefile b/drivers/gpu/drm/r128/Makefile
index 1cc72ae..1a6700e 100644
--- a/drivers/gpu/drm/r128/Makefile
+++ b/drivers/gpu/drm/r128/Makefile
@@ -2,7 +2,6 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-ccflags-y := -Iinclude/drm
 r128-y   := r128_drv.o r128_cce.o r128_state.o r128_irq.o
 
 r128-$(CONFIG_COMPAT)   += r128_ioc32.o
-- 
2.7.4

[PATCH v2 24/29] drm/savage: remove unneeded -Iinclude/drm compiler flag

[Masahiro Yamada]

With the include directives under include/drm/ fixed, this flag is
no longer needed.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2: None

 drivers/gpu/drm/savage/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/savage/Makefile b/drivers/gpu/drm/savage/Makefile
index d8f84ac..cfd436b 100644
--- a/drivers/gpu/drm/savage/Makefile
+++ b/drivers/gpu/drm/savage/Makefile
@@ -2,7 +2,6 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-ccflags-y = -Iinclude/drm
 savage-y := savage_drv.o savage_bci.o savage_state.o
 
 obj-$(CONFIG_DRM_SAVAGE)+= savage.o
-- 
2.7.4

[PATCH v2 25/29] drm/sis: remove unneeded -Iinclude/drm compiler flag

[Masahiro Yamada]

With the include directives under include/drm/ fixed, this flag is
no longer needed.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2: None

 drivers/gpu/drm/sis/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/sis/Makefile b/drivers/gpu/drm/sis/Makefile
index 441c061..7bf4c13 100644
--- a/drivers/gpu/drm/sis/Makefile
+++ b/drivers/gpu/drm/sis/Makefile
@@ -2,7 +2,6 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-ccflags-y = -Iinclude/drm
 sis-y := sis_drv.o sis_mm.o
 
 obj-$(CONFIG_DRM_SIS)   += sis.o
-- 
2.7.4

[PATCH v2 26/29] drm/tdfx: remove unneeded -Iinclude/drm compiler flag

[Masahiro Yamada]

With the include directives under include/drm/ fixed, this flag is
no longer needed.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2: None

 drivers/gpu/drm/tdfx/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/tdfx/Makefile b/drivers/gpu/drm/tdfx/Makefile
index 0379f29..74bd4ae3 100644
--- a/drivers/gpu/drm/tdfx/Makefile
+++ b/drivers/gpu/drm/tdfx/Makefile
@@ -2,7 +2,6 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-ccflags-y := -Iinclude/drm
 tdfx-y := tdfx_drv.o
 
 obj-$(CONFIG_DRM_TDFX)	+= tdfx.o
-- 
2.7.4

[PATCH v2 27/29] drm/udl: remove unneeded -Iinclude/drm compiler flag

[Masahiro Yamada]

With the include directives under include/drm/ fixed, this flag is
no longer needed.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2: None

 drivers/gpu/drm/udl/Makefile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/gpu/drm/udl/Makefile b/drivers/gpu/drm/udl/Makefile
index 195bcac..36f2e82 100644
--- a/drivers/gpu/drm/udl/Makefile
+++ b/drivers/gpu/drm/udl/Makefile
@@ -1,6 +1,3 @@
-
-ccflags-y := -Iinclude/drm
-
 udl-y := udl_drv.o udl_modeset.o udl_connector.o udl_encoder.o udl_main.o udl_fb.o udl_transfer.o udl_gem.o udl_dmabuf.o
 
 obj-$(CONFIG_DRM_UDL) := udl.o
-- 
2.7.4

[PATCH v2 28/29] drm/vgem: remove unneeded -Iinclude/drm compiler flag

[Masahiro Yamada]

With the include directives under include/drm/ fixed, this flag is
no longer needed.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2: None

 drivers/gpu/drm/vgem/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/vgem/Makefile b/drivers/gpu/drm/vgem/Makefile
index bfcdea1..cb5d413 100644
--- a/drivers/gpu/drm/vgem/Makefile
+++ b/drivers/gpu/drm/vgem/Makefile
@@ -1,4 +1,3 @@
-ccflags-y := -Iinclude/drm
 vgem-y := vgem_drv.o vgem_fence.o
 
 obj-$(CONFIG_DRM_VGEM)	+= vgem.o
-- 
2.7.4

[PATCH v2 29/29] drm/via: remove unneeded -Iinclude/drm compiler flag

[Masahiro Yamada]

With the include directives under include/drm/ fixed, this flag is
no longer needed.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2: None

 drivers/gpu/drm/via/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/via/Makefile b/drivers/gpu/drm/via/Makefile
index d59e258..751fa8b 100644
--- a/drivers/gpu/drm/via/Makefile
+++ b/drivers/gpu/drm/via/Makefile
@@ -2,7 +2,6 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-ccflags-y := -Iinclude/drm
 via-y    := via_irq.o via_drv.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o via_dmablit.o
 
 obj-$(CONFIG_DRM_VIA)	+=via.o
-- 
2.7.4

Re: [PATCH v2 02/29] drm/ttm: fix include notation and remove -Iinclude/drm flag

[Michel Dänzer]

On 24/04/17 01:50 PM, Masahiro Yamada wrote:
> 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)

Thanks!

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>


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

Re: [PATCH v2 15/29] drm/vc4: fix include notation and remove -Iinclude/drm flag

[Daniel Vetter]

On Mon, Apr 24, 2017 at 01:50:33PM +0900, Masahiro Yamada wrote:
> Include <drm/*.h> instead of relative path from include/drm, then
> remove the -Iinclude/drm compiler flag.
> 
> While we are here, use <...> instead of "..." for include/linux/*.h
> headers too.
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

This one doesn't apply anymore cleanly. Can you pls rebase onto latest
linux-next? I'm going through the remaining patches, up to this all merged
to drm-misc-next.

Thanks, Daniel
> ---
> 
> Changes in v2: None
> 
>  drivers/gpu/drm/vc4/Makefile    |  2 --
>  drivers/gpu/drm/vc4/vc4_crtc.c  | 14 +++++++-------
>  drivers/gpu/drm/vc4/vc4_dpi.c   | 16 ++++++++--------
>  drivers/gpu/drm/vc4/vc4_drv.c   |  2 +-
>  drivers/gpu/drm/vc4/vc4_drv.h   |  5 ++---
>  drivers/gpu/drm/vc4/vc4_dsi.c   | 28 ++++++++++++++--------------
>  drivers/gpu/drm/vc4/vc4_hdmi.c  | 20 ++++++++++----------
>  drivers/gpu/drm/vc4/vc4_hvs.c   |  2 +-
>  drivers/gpu/drm/vc4/vc4_kms.c   | 12 ++++++------
>  drivers/gpu/drm/vc4/vc4_plane.c |  9 +++++----
>  drivers/gpu/drm/vc4/vc4_v3d.c   |  4 ++--
>  11 files changed, 56 insertions(+), 58 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vc4/Makefile b/drivers/gpu/drm/vc4/Makefile
> index 61f45d1..f0efc7eb 100644
> --- a/drivers/gpu/drm/vc4/Makefile
> +++ b/drivers/gpu/drm/vc4/Makefile
> @@ -1,5 +1,3 @@
> -ccflags-y := -Iinclude/drm
> -
>  # Please keep these build lists sorted!
>  
>  # core driver code
> diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
> index d86c8cc..34d2e8a 100644
> --- a/drivers/gpu/drm/vc4/vc4_crtc.c
> +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
> @@ -32,13 +32,13 @@
>   * ones that set the clock.
>   */
>  
> -#include "drm_atomic.h"
> -#include "drm_atomic_helper.h"
> -#include "drm_crtc_helper.h"
> -#include "linux/clk.h"
> -#include "drm_fb_cma_helper.h"
> -#include "linux/component.h"
> -#include "linux/of_device.h"
> +#include <drm/drm_atomic.h>
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_crtc_helper.h>
> +#include <linux/clk.h>
> +#include <drm/drm_fb_cma_helper.h>
> +#include <linux/component.h>
> +#include <linux/of_device.h>
>  #include "vc4_drv.h"
>  #include "vc4_regs.h"
>  
> diff --git a/drivers/gpu/drm/vc4/vc4_dpi.c b/drivers/gpu/drm/vc4/vc4_dpi.c
> index c6d7039..39d6808 100644
> --- a/drivers/gpu/drm/vc4/vc4_dpi.c
> +++ b/drivers/gpu/drm/vc4/vc4_dpi.c
> @@ -22,14 +22,14 @@
>   * ALT2 function.
>   */
>  
> -#include "drm_atomic_helper.h"
> -#include "drm_crtc_helper.h"
> -#include "drm_edid.h"
> -#include "drm_panel.h"
> -#include "linux/clk.h"
> -#include "linux/component.h"
> -#include "linux/of_graph.h"
> -#include "linux/of_platform.h"
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_crtc_helper.h>
> +#include <drm/drm_edid.h>
> +#include <drm/drm_panel.h>
> +#include <linux/clk.h>
> +#include <linux/component.h>
> +#include <linux/of_graph.h>
> +#include <linux/of_platform.h>
>  #include "vc4_drv.h"
>  #include "vc4_regs.h"
>  
> diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
> index 61e674b..2037a5f 100644
> --- a/drivers/gpu/drm/vc4/vc4_drv.c
> +++ b/drivers/gpu/drm/vc4/vc4_drv.c
> @@ -31,7 +31,7 @@
>  #include <linux/of_platform.h>
>  #include <linux/platform_device.h>
>  #include <linux/pm_runtime.h>
> -#include "drm_fb_cma_helper.h"
> +#include <drm/drm_fb_cma_helper.h>
>  #include <drm/drm_fb_helper.h>
>  
>  #include "uapi/drm/vc4_drm.h"
> diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
> index dffce629..ebfef52 100644
> --- a/drivers/gpu/drm/vc4/vc4_drv.h
> +++ b/drivers/gpu/drm/vc4/vc4_drv.h
> @@ -6,10 +6,9 @@
>   * published by the Free Software Foundation.
>   */
>  
> -#include "drmP.h"
> -#include "drm_gem_cma_helper.h"
> -
> +#include <drm/drmP.h>
>  #include <drm/drm_encoder.h>
> +#include <drm/drm_gem_cma_helper.h>
>  
>  struct vc4_dev {
>  	struct drm_device *dev;
> diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c
> index 160f981..d18c9b1 100644
> --- a/drivers/gpu/drm/vc4/vc4_dsi.c
> +++ b/drivers/gpu/drm/vc4/vc4_dsi.c
> @@ -29,20 +29,20 @@
>   * hopefully present.
>   */
>  
> -#include "drm_atomic_helper.h"
> -#include "drm_crtc_helper.h"
> -#include "drm_edid.h"
> -#include "drm_mipi_dsi.h"
> -#include "drm_panel.h"
> -#include "linux/clk.h"
> -#include "linux/clk-provider.h"
> -#include "linux/completion.h"
> -#include "linux/component.h"
> -#include "linux/dmaengine.h"
> -#include "linux/i2c.h"
> -#include "linux/of_address.h"
> -#include "linux/of_platform.h"
> -#include "linux/pm_runtime.h"
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_crtc_helper.h>
> +#include <drm/drm_edid.h>
> +#include <drm/drm_mipi_dsi.h>
> +#include <drm/drm_panel.h>
> +#include <linux/clk.h>
> +#include <linux/clk-provider.h>
> +#include <linux/completion.h>
> +#include <linux/component.h>
> +#include <linux/dmaengine.h>
> +#include <linux/i2c.h>
> +#include <linux/of_address.h>
> +#include <linux/of_platform.h>
> +#include <linux/pm_runtime.h>
>  #include "vc4_drv.h"
>  #include "vc4_regs.h"
>  
> diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
> index e9cbe26..c91591c 100644
> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
> +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
> @@ -42,16 +42,16 @@
>   * encoder block has CEC support.
>   */
>  
> -#include "drm_atomic_helper.h"
> -#include "drm_crtc_helper.h"
> -#include "drm_edid.h"
> -#include "linux/clk.h"
> -#include "linux/component.h"
> -#include "linux/i2c.h"
> -#include "linux/of_address.h"
> -#include "linux/of_gpio.h"
> -#include "linux/of_platform.h"
> -#include "linux/rational.h"
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_crtc_helper.h>
> +#include <drm/drm_edid.h>
> +#include <linux/clk.h>
> +#include <linux/component.h>
> +#include <linux/i2c.h>
> +#include <linux/of_address.h>
> +#include <linux/of_gpio.h>
> +#include <linux/of_platform.h>
> +#include <linux/rational.h>
>  #include "sound/dmaengine_pcm.h"
>  #include "sound/pcm_drm_eld.h"
>  #include "sound/pcm_params.h"
> diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c
> index fd421ba..2b62fc5 100644
> --- a/drivers/gpu/drm/vc4/vc4_hvs.c
> +++ b/drivers/gpu/drm/vc4/vc4_hvs.c
> @@ -22,7 +22,7 @@
>   * each CRTC.
>   */
>  
> -#include "linux/component.h"
> +#include <linux/component.h>
>  #include "vc4_drv.h"
>  #include "vc4_regs.h"
>  
> diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
> index ad7925a..3f2e64e 100644
> --- a/drivers/gpu/drm/vc4/vc4_kms.c
> +++ b/drivers/gpu/drm/vc4/vc4_kms.c
> @@ -14,12 +14,12 @@
>   * crtc, HDMI encoder).
>   */
>  
> -#include "drm_crtc.h"
> -#include "drm_atomic.h"
> -#include "drm_atomic_helper.h"
> -#include "drm_crtc_helper.h"
> -#include "drm_plane_helper.h"
> -#include "drm_fb_cma_helper.h"
> +#include <drm/drm_crtc.h>
> +#include <drm/drm_atomic.h>
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_crtc_helper.h>
> +#include <drm/drm_plane_helper.h>
> +#include <drm/drm_fb_cma_helper.h>
>  #include "vc4_drv.h"
>  
>  static void vc4_output_poll_changed(struct drm_device *dev)
> diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
> index d34cd53..da18dec 100644
> --- a/drivers/gpu/drm/vc4/vc4_plane.c
> +++ b/drivers/gpu/drm/vc4/vc4_plane.c
> @@ -18,12 +18,13 @@
>   * into the region of the HVS that it has allocated for us.
>   */
>  
> +#include <drm/drm_atomic.h>
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_fb_cma_helper.h>
> +#include <drm/drm_plane_helper.h>
> +
>  #include "vc4_drv.h"
>  #include "vc4_regs.h"
> -#include "drm_atomic.h"
> -#include "drm_atomic_helper.h"
> -#include "drm_fb_cma_helper.h"
> -#include "drm_plane_helper.h"
>  
>  enum vc4_scaling_mode {
>  	VC4_SCALING_NONE,
> diff --git a/drivers/gpu/drm/vc4/vc4_v3d.c b/drivers/gpu/drm/vc4/vc4_v3d.c
> index 7cc346a..b0f223f 100644
> --- a/drivers/gpu/drm/vc4/vc4_v3d.c
> +++ b/drivers/gpu/drm/vc4/vc4_v3d.c
> @@ -16,8 +16,8 @@
>   * this program.  If not, see <http://www.gnu.org/licenses/>.
>   */
>  
> -#include "linux/component.h"
> -#include "linux/pm_runtime.h"
> +#include <linux/component.h>
> +#include <linux/pm_runtime.h>
>  #include "vc4_drv.h"
>  #include "vc4_regs.h"
>  
> -- 
> 2.7.4
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

Re: [PATCH v2 15/29] drm/vc4: fix include notation and remove -Iinclude/drm flag

[Masahiro Yamada]

Hi Daniel,


2017-05-17 21:40 GMT+09:00 Daniel Vetter <daniel@ffwll.ch>:
> On Mon, Apr 24, 2017 at 01:50:33PM +0900, Masahiro Yamada wrote:
>> Include <drm/*.h> instead of relative path from include/drm, then
>> remove the -Iinclude/drm compiler flag.
>>
>> While we are here, use <...> instead of "..." for include/linux/*.h
>> headers too.
>>
>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>
> This one doesn't apply anymore cleanly. Can you pls rebase onto latest
> linux-next? I'm going through the remaining patches, up to this all merged
> to drm-misc-next.
>
> Thanks, Daniel

I rebased this one as you suggested
and send v3 for the rest of the series.


Please note I am also adding

12/16 : drm/stm: remove unneeded -Iinclude/drm compiler flag

because a new user of -Iinclude/drm has appeared.


Thanks!




-- 
Best Regards
Masahiro Yamada

Re: [PATCH v2 00/29] gpu/drm: remove -Iinclude/drm compiler flags from Makefile

[Daniel Vetter]

On Mon, Apr 24, 2017 at 01:50:18PM +0900, Masahiro Yamada wrote:
> Many Makefiles needed to add -Iinclude/drm as an include path,
> but the right thing to do is to include headers in the form
>   #include <drm/.../*.h>
> 
> This series fixes the source files, then rip off -Iinclude/drm flags.
> 
> 
> Masahiro Yamada (29):
>   drm: make drm_panel.h self-contained
>   drm/ttm: fix include notation and remove -Iinclude/drm flag
>   drm/amd: fix include notation and remove -Iinclude/drm flag
>   drm/ast: fix include notation and remove -Iinclude/drm flag
>   drm/bochs: fix include notation and remove -Iinclude/drm flag
>   drm/bridge: fix include notation and remove -Iinclude/drm flag
>   drm/cirrus: fix include notation and remove -Iinclude/drm flag
>   drm/hisilicon: fix include notation and remove -Iinclude/drm flag
>   drm/mgag200: fix include notation and remove -Iinclude/drm flag
>   drm/msm: fix include notation and remove -Iinclude/drm flag
>   drm/nouveau: fix include notation and remove -Iinclude/drm flag
>   drm/qxl: fix include notation and remove -Iinclude/drm flag
>   drm/radeon: fix include notation and remove -Iinclude/drm flag
>   drm/tilcdc: fix include notation and remove -Iinclude/drm flag
>   drm/vc4: fix include notation and remove -Iinclude/drm flag
>   drm/virtio: fix include notation and remove -Iinclude/drm flag
>   drm/vmwgfx: fix include notation and remove -Iinclude/drm flag
>   drm/gma500: remove unneeded -Iinclude/drm compiler flag
>   drm/i810: remove unneeded -Iinclude/drm compiler flag
>   drm/i2c: remove unneeded -Iinclude/drm compiler flag
>   drm/mga: remove unneeded -Iinclude/drm compiler flag
>   drm/omap: remove unneeded -Iinclude/drm compiler flag
>   drm/r128: remove unneeded -Iinclude/drm compiler flag
>   drm/savage: remove unneeded -Iinclude/drm compiler flag
>   drm/sis: remove unneeded -Iinclude/drm compiler flag
>   drm/tdfx: remove unneeded -Iinclude/drm compiler flag
>   drm/udl: remove unneeded -Iinclude/drm compiler flag
>   drm/vgem: remove unneeded -Iinclude/drm compiler flag
>   drm/via: remove unneeded -Iinclude/drm compiler flag

Ok, I think I merged them all except the vc4 one. Can you please
rebase&resubmit that one?

Thanks, Daniel

> 
>  drivers/gpu/drm/amd/amdgpu/Makefile              |  2 +-
>  drivers/gpu/drm/amd/amdgpu/amdgpu.h              | 10 ++++-----
>  drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c          |  2 +-
>  drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c          |  2 +-
>  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c          |  2 +-
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c          | 10 ++++-----
>  drivers/gpu/drm/amd/amdgpu/ci_dpm.c              |  2 +-
>  drivers/gpu/drm/amd/amdgpu/ci_smc.c              |  2 +-
>  drivers/gpu/drm/amd/amdgpu/cik.c                 |  2 +-
>  drivers/gpu/drm/amd/amdgpu/cik_ih.c              |  2 +-
>  drivers/gpu/drm/amd/amdgpu/cz_ih.c               |  2 +-
>  drivers/gpu/drm/amd/amdgpu/dce_v10_0.c           |  2 +-
>  drivers/gpu/drm/amd/amdgpu/dce_v11_0.c           |  2 +-
>  drivers/gpu/drm/amd/amdgpu/dce_v6_0.c            |  2 +-
>  drivers/gpu/drm/amd/amdgpu/dce_v8_0.c            |  2 +-
>  drivers/gpu/drm/amd/amdgpu/dce_virtual.c         |  2 +-
>  drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c            |  2 +-
>  drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c            |  2 +-
>  drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c            |  2 +-
>  drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c            |  2 +-
>  drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c            |  2 +-
>  drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c            |  2 +-
>  drivers/gpu/drm/amd/amdgpu/iceland_ih.c          |  2 +-
>  drivers/gpu/drm/amd/amdgpu/kv_dpm.c              |  2 +-
>  drivers/gpu/drm/amd/amdgpu/kv_smc.c              |  2 +-
>  drivers/gpu/drm/amd/amdgpu/psp_v3_1.c            |  2 +-
>  drivers/gpu/drm/amd/amdgpu/si.c                  |  2 +-
>  drivers/gpu/drm/amd/amdgpu/si_dpm.c              |  2 +-
>  drivers/gpu/drm/amd/amdgpu/si_ih.c               |  2 +-
>  drivers/gpu/drm/amd/amdgpu/si_smc.c              |  2 +-
>  drivers/gpu/drm/amd/amdgpu/soc15.c               |  2 +-
>  drivers/gpu/drm/amd/amdgpu/tonga_ih.c            |  2 +-
>  drivers/gpu/drm/amd/amdgpu/vega10_ih.c           |  2 +-
>  drivers/gpu/drm/amd/amdgpu/vi.c                  |  2 +-
>  drivers/gpu/drm/amd/amdkfd/Makefile              |  2 +-
>  drivers/gpu/drm/amd/powerplay/Makefile           |  2 +-
>  drivers/gpu/drm/ast/Makefile                     |  2 --
>  drivers/gpu/drm/ast/ast_ttm.c                    |  3 ++-
>  drivers/gpu/drm/bochs/Makefile                   |  1 -
>  drivers/gpu/drm/bochs/bochs.h                    |  4 ++--
>  drivers/gpu/drm/bridge/Makefile                  |  2 --
>  drivers/gpu/drm/bridge/nxp-ptn3460.c             | 12 +++++-----
>  drivers/gpu/drm/bridge/parade-ps8622.c           | 10 ++++-----
>  drivers/gpu/drm/cirrus/Makefile                  |  1 -
>  drivers/gpu/drm/cirrus/cirrus_ttm.c              |  3 ++-
>  drivers/gpu/drm/gma500/Makefile                  |  1 -
>  drivers/gpu/drm/hisilicon/hibmc/Makefile         |  1 -
>  drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c      |  2 +-
>  drivers/gpu/drm/i2c/Makefile                     |  2 --
>  drivers/gpu/drm/i810/Makefile                    |  1 -
>  drivers/gpu/drm/mga/Makefile                     |  1 -
>  drivers/gpu/drm/mgag200/Makefile                 |  1 -
>  drivers/gpu/drm/mgag200/mgag200_ttm.c            |  3 ++-
>  drivers/gpu/drm/msm/Makefile                     |  2 +-
>  drivers/gpu/drm/msm/dsi/dsi.h                    |  6 ++---
>  drivers/gpu/drm/msm/edp/edp.h                    |  4 ++--
>  drivers/gpu/drm/msm/edp/edp_ctrl.c               |  6 ++---
>  drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c         | 10 ++++-----
>  drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c  |  6 ++---
>  drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c  |  7 +++---
>  drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h          |  4 +++-
>  drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c |  6 ++---
>  drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c  |  6 ++---
>  drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c         | 10 ++++-----
>  drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c      |  6 ++---
>  drivers/gpu/drm/msm/msm_fb.c                     |  6 ++---
>  drivers/gpu/drm/msm/msm_fbdev.c                  |  6 ++---
>  drivers/gpu/drm/nouveau/Kbuild                   |  1 -
>  drivers/gpu/drm/nouveau/nouveau_drm.c            |  4 ++--
>  drivers/gpu/drm/nouveau/nouveau_drv.h            |  2 +-
>  drivers/gpu/drm/nouveau/nouveau_ttm.c            |  2 +-
>  drivers/gpu/drm/omapdrm/Makefile                 |  1 -
>  drivers/gpu/drm/qxl/Makefile                     |  2 --
>  drivers/gpu/drm/qxl/qxl_debugfs.c                |  2 +-
>  drivers/gpu/drm/qxl/qxl_display.c                |  9 ++++----
>  drivers/gpu/drm/qxl/qxl_drv.c                    |  6 ++---
>  drivers/gpu/drm/qxl/qxl_drv.h                    | 18 +++++++--------
>  drivers/gpu/drm/qxl/qxl_fb.c                     | 11 +++++-----
>  drivers/gpu/drm/qxl/qxl_gem.c                    |  5 +++--
>  drivers/gpu/drm/qxl/qxl_ttm.c                    | 10 ++++-----
>  drivers/gpu/drm/r128/Makefile                    |  1 -
>  drivers/gpu/drm/radeon/Makefile                  |  2 +-
>  drivers/gpu/drm/radeon/btc_dpm.c                 |  2 +-
>  drivers/gpu/drm/radeon/ci_dpm.c                  |  2 +-
>  drivers/gpu/drm/radeon/ci_smc.c                  |  2 +-
>  drivers/gpu/drm/radeon/cik.c                     |  2 +-
>  drivers/gpu/drm/radeon/cypress_dpm.c             |  2 +-
>  drivers/gpu/drm/radeon/kv_dpm.c                  |  2 +-
>  drivers/gpu/drm/radeon/kv_smc.c                  |  2 +-
>  drivers/gpu/drm/radeon/ni_dpm.c                  |  2 +-
>  drivers/gpu/drm/radeon/r600_dpm.c                |  2 +-
>  drivers/gpu/drm/radeon/radeon.h                  | 10 ++++-----
>  drivers/gpu/drm/radeon/radeon_drv.c              |  2 +-
>  drivers/gpu/drm/radeon/radeon_ttm.c              | 10 ++++-----
>  drivers/gpu/drm/radeon/rs780_dpm.c               |  2 +-
>  drivers/gpu/drm/radeon/rv6xx_dpm.c               |  2 +-
>  drivers/gpu/drm/radeon/rv730_dpm.c               |  2 +-
>  drivers/gpu/drm/radeon/rv740_dpm.c               |  2 +-
>  drivers/gpu/drm/radeon/rv770_dpm.c               |  2 +-
>  drivers/gpu/drm/radeon/rv770_smc.c               |  2 +-
>  drivers/gpu/drm/radeon/si_dpm.c                  |  2 +-
>  drivers/gpu/drm/radeon/si_smc.c                  |  2 +-
>  drivers/gpu/drm/radeon/sumo_dpm.c                |  2 +-
>  drivers/gpu/drm/radeon/sumo_smc.c                |  2 +-
>  drivers/gpu/drm/radeon/trinity_dpm.c             |  2 +-
>  drivers/gpu/drm/radeon/trinity_smc.c             |  2 +-
>  drivers/gpu/drm/savage/Makefile                  |  1 -
>  drivers/gpu/drm/sis/Makefile                     |  1 -
>  drivers/gpu/drm/tdfx/Makefile                    |  1 -
>  drivers/gpu/drm/tilcdc/Makefile                  |  1 -
>  drivers/gpu/drm/tilcdc/tilcdc_drv.c              |  3 +--
>  drivers/gpu/drm/ttm/Makefile                     |  1 -
>  drivers/gpu/drm/ttm/ttm_bo_vm.c                  |  6 ++---
>  drivers/gpu/drm/udl/Makefile                     |  3 ---
>  drivers/gpu/drm/vc4/Makefile                     |  2 --
>  drivers/gpu/drm/vc4/vc4_crtc.c                   | 14 ++++++------
>  drivers/gpu/drm/vc4/vc4_dpi.c                    | 16 +++++++-------
>  drivers/gpu/drm/vc4/vc4_drv.c                    |  2 +-
>  drivers/gpu/drm/vc4/vc4_drv.h                    |  5 ++---
>  drivers/gpu/drm/vc4/vc4_dsi.c                    | 28 ++++++++++++------------
>  drivers/gpu/drm/vc4/vc4_hdmi.c                   | 20 ++++++++---------
>  drivers/gpu/drm/vc4/vc4_hvs.c                    |  2 +-
>  drivers/gpu/drm/vc4/vc4_kms.c                    | 12 +++++-----
>  drivers/gpu/drm/vc4/vc4_plane.c                  |  9 ++++----
>  drivers/gpu/drm/vc4/vc4_v3d.c                    |  4 ++--
>  drivers/gpu/drm/vgem/Makefile                    |  1 -
>  drivers/gpu/drm/via/Makefile                     |  1 -
>  drivers/gpu/drm/virtio/Makefile                  |  2 --
>  drivers/gpu/drm/virtio/virtgpu_debugfs.c         |  2 +-
>  drivers/gpu/drm/virtio/virtgpu_drv.c             |  4 ++--
>  drivers/gpu/drm/virtio/virtgpu_drv.h             |  8 +++----
>  drivers/gpu/drm/virtio/virtgpu_ioctl.c           |  5 +++--
>  drivers/gpu/drm/virtio/virtgpu_ttm.c             | 10 ++++-----
>  drivers/gpu/drm/vmwgfx/Makefile                  |  3 ---
>  drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c           |  3 ++-
>  drivers/gpu/drm/vmwgfx/vmwgfx_context.c          |  3 ++-
>  drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c          |  3 ++-
>  drivers/gpu/drm/vmwgfx/vmwgfx_msg.c              |  2 +-
>  drivers/gpu/drm/vmwgfx/vmwgfx_shader.c           |  3 ++-
>  drivers/gpu/drm/vmwgfx/vmwgfx_surface.c          |  3 ++-
>  include/drm/drm_panel.h                          |  2 ++
>  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 ++-
>  145 files changed, 271 insertions(+), 296 deletions(-)
> 
> -- 
> 2.7.4
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

Re: [PATCH v2 00/29] gpu/drm: remove -Iinclude/drm compiler flags from Makefile

[Masahiro Yamada]

Hi Daniel,


2017-05-18 14:38 GMT+09:00 Daniel Vetter <daniel@ffwll.ch>:
> On Mon, Apr 24, 2017 at 01:50:18PM +0900, Masahiro Yamada wrote:
>> Many Makefiles needed to add -Iinclude/drm as an include path,
>> but the right thing to do is to include headers in the form
>>   #include <drm/.../*.h>
>>
>> This series fixes the source files, then rip off -Iinclude/drm flags.
>>
>>
>> Masahiro Yamada (29):
>>   drm: make drm_panel.h self-contained
>>   drm/ttm: fix include notation and remove -Iinclude/drm flag
>>   drm/amd: fix include notation and remove -Iinclude/drm flag
>>   drm/ast: fix include notation and remove -Iinclude/drm flag
>>   drm/bochs: fix include notation and remove -Iinclude/drm flag
>>   drm/bridge: fix include notation and remove -Iinclude/drm flag
>>   drm/cirrus: fix include notation and remove -Iinclude/drm flag
>>   drm/hisilicon: fix include notation and remove -Iinclude/drm flag
>>   drm/mgag200: fix include notation and remove -Iinclude/drm flag
>>   drm/msm: fix include notation and remove -Iinclude/drm flag
>>   drm/nouveau: fix include notation and remove -Iinclude/drm flag
>>   drm/qxl: fix include notation and remove -Iinclude/drm flag
>>   drm/radeon: fix include notation and remove -Iinclude/drm flag
>>   drm/tilcdc: fix include notation and remove -Iinclude/drm flag
>>   drm/vc4: fix include notation and remove -Iinclude/drm flag
>>   drm/virtio: fix include notation and remove -Iinclude/drm flag
>>   drm/vmwgfx: fix include notation and remove -Iinclude/drm flag
>>   drm/gma500: remove unneeded -Iinclude/drm compiler flag
>>   drm/i810: remove unneeded -Iinclude/drm compiler flag
>>   drm/i2c: remove unneeded -Iinclude/drm compiler flag
>>   drm/mga: remove unneeded -Iinclude/drm compiler flag
>>   drm/omap: remove unneeded -Iinclude/drm compiler flag
>>   drm/r128: remove unneeded -Iinclude/drm compiler flag
>>   drm/savage: remove unneeded -Iinclude/drm compiler flag
>>   drm/sis: remove unneeded -Iinclude/drm compiler flag
>>   drm/tdfx: remove unneeded -Iinclude/drm compiler flag
>>   drm/udl: remove unneeded -Iinclude/drm compiler flag
>>   drm/vgem: remove unneeded -Iinclude/drm compiler flag
>>   drm/via: remove unneeded -Iinclude/drm compiler flag
>
> Ok, I think I merged them all except the vc4 one. Can you please
> rebase&resubmit that one?
>

I had already submitted the one.

https://patchwork.kernel.org/patch/9734869/

and one more patch

https://patchwork.kernel.org/patch/9734827/



-- 
Best Regards
Masahiro Yamada