Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1627272

[PATCH 11/28] drm/qxl: fix include notation and remove -Iinclude/drm flag

From Masahiro Yamada <yamada.masahiro@socionext.com>
Newsgroups linux.kernel
Subject [PATCH 11/28] drm/qxl: fix include notation and remove -Iinclude/drm flag
Date 2017-04-20 12:10 +0200
Message-ID <tyhcf-7D4-35@gated-at.bofh.it> (permalink)
References <tyh2x-7kt-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

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

 drivers/gpu/drm/qxl/Makefile      |  2 --
 drivers/gpu/drm/qxl/qxl_debugfs.c |  2 +-
 drivers/gpu/drm/qxl/qxl_display.c |  2 +-
 drivers/gpu/drm/qxl/qxl_drv.c     |  6 +++---
 drivers/gpu/drm/qxl/qxl_drv.h     | 14 +++++++-------
 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, 26 insertions(+), 26 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..cae03c9 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -28,7 +28,7 @@
 
 #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>
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..0297d1f 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.h
+++ b/drivers/gpu/drm/qxl/qxl_drv.h
@@ -36,18 +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/drmP.h>
+#include <drm/drm_crtc.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/drm_encoder.h>
 #include <drm/drm_gem.h>
 
 /* just for ttm_validate_buffer */
-#include <ttm/ttm_execbuf_util.h>
+#include <drm/ttm/ttm_execbuf_util.h>
 
 #include <drm/qxl_drm.h>
 #include "qxl_dev.h"
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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/28] gpu/drm: remove -Iinclude/drm compiler flags from Makefile Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-04-20 12:00 +0200
  [PATCH 18/28] drm/i810: remove unneeded -Iinclude/drm compiler flag Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-04-20 12:10 +0200
  [PATCH 23/28] drm/savage: remove unneeded -Iinclude/drm compiler flag Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-04-20 12:10 +0200
  [PATCH 15/28] drm/virtio: fix include notation and remove -Iinclude/drm flag Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-04-20 12:10 +0200
  [PATCH 10/28] drm/nouveau: fix include notation and remove -Iinclude/drm flag Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-04-20 12:10 +0200
  [PATCH 05/28] drm/bridge: fix include notation and remove -Iinclude/drm flag Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-04-20 12:10 +0200
    Re: [PATCH 05/28] drm/bridge: fix include notation and remove  -Iinclude/drm flag Andrzej Hajda <a.hajda@samsung.com> - 2017-04-21 08:00 +0200
      Re: [PATCH 05/28] drm/bridge: fix include notation and remove  -Iinclude/drm flag Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-04-21 11:00 +0200
  [PATCH 26/28] drm/udl: remove unneeded -Iinclude/drm compiler flag Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-04-20 12:10 +0200
  [PATCH 17/28] drm/gma500: remove unneeded -Iinclude/drm compiler flag Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-04-20 12:10 +0200
  [PATCH 11/28] drm/qxl: fix include notation and remove -Iinclude/drm flag Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-04-20 12:10 +0200
  [PATCH 27/28] drm/vgem: remove unneeded -Iinclude/drm compiler flag Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-04-20 12:10 +0200
  [PATCH 22/28] drm/r128: remove unneeded -Iinclude/drm compiler flag Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-04-20 12:10 +0200
  [PATCH 28/28] drm/via: remove unneeded -Iinclude/drm compiler flag Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-04-20 12:10 +0200
  [PATCH 07/28] drm/hisilicon: fix include notation and remove -Iinclude/drm flag Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-04-20 12:10 +0200
  [PATCH 08/28] drm/mgag200: fix include notation and remove -Iinclude/drm flag Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-04-20 12:10 +0200
  [PATCH 19/28] drm/i2c: remove unneeded -Iinclude/drm compiler flag Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-04-20 12:10 +0200
  [PATCH 25/28] drm/tdfx: remove unneeded -Iinclude/drm compiler flag Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-04-20 12:10 +0200
  [PATCH 24/28] drm/sis: remove unneeded -Iinclude/drm compiler flag Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-04-20 12:10 +0200
  [PATCH 20/28] drm/mga: remove unneeded -Iinclude/drm compiler flag Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-04-20 12:10 +0200
  [PATCH 03/28] drm/ast: fix include notation and remove -Iinclude/drm flag Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-04-20 12:10 +0200
  [PATCH 14/28] drm/vc4: fix include notation and remove -Iinclude/drm flag Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-04-20 12:10 +0200

csiph-web