From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: dri-devel@lists.freedesktop.org, David Airlie <airlied@linux.ie>,
Daniel Vetter <daniel.vetter@intel.com>,
Jani Nikula <jani.nikula@linux.intel.com>,
Sean Paul <seanpaul@chromium.org>
Cc: linux-kernel@vger.kernel.org,
Masahiro Yamada <yamada.masahiro@socionext.com>
Subject: [PATCH v2 16/29] drm/virtio: fix include notation and remove -Iinclude/drm flag
Date: Mon, 24 Apr 2017 13:50:34 +0900 [thread overview]
Message-ID: <1493009447-31524-17-git-send-email-yamada.masahiro@socionext.com> (raw)
In-Reply-To: <1493009447-31524-1-git-send-email-yamada.masahiro@socionext.com>
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
next prev parent reply other threads:[~2017-04-24 4:52 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-24 4:50 [PATCH v2 00/29] gpu/drm: remove -Iinclude/drm compiler flags from Makefile Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 01/29] drm: make drm_panel.h self-contained Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 02/29] drm/ttm: fix include notation and remove -Iinclude/drm flag Masahiro Yamada
2017-04-25 3:57 ` Michel Dänzer
2017-04-25 3:57 ` Michel Dänzer
2017-04-24 4:50 ` [PATCH v2 03/29] drm/amd: " Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 04/29] drm/ast: " Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 05/29] drm/bochs: " Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 06/29] drm/bridge: " Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 07/29] drm/cirrus: " Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 08/29] drm/hisilicon: " Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 09/29] drm/mgag200: " Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 10/29] drm/msm: " Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 11/29] drm/nouveau: " Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 12/29] drm/qxl: " Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 13/29] drm/radeon: " Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 14/29] drm/tilcdc: " Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 15/29] drm/vc4: " Masahiro Yamada
2017-05-17 12:40 ` Daniel Vetter
2017-05-17 12:40 ` Daniel Vetter
2017-05-18 4:35 ` Masahiro Yamada
2017-04-24 4:50 ` Masahiro Yamada [this message]
2017-04-24 4:50 ` [PATCH v2 17/29] drm/vmwgfx: " Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 18/29] drm/gma500: remove unneeded -Iinclude/drm compiler flag Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 19/29] drm/i810: " Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 20/29] drm/i2c: " Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 21/29] drm/mga: " Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 22/29] drm/omap: " Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 23/29] drm/r128: " Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 24/29] drm/savage: " Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 25/29] drm/sis: " Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 26/29] drm/tdfx: " Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 27/29] drm/udl: " Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 28/29] drm/vgem: " Masahiro Yamada
2017-04-24 4:50 ` [PATCH v2 29/29] drm/via: " Masahiro Yamada
2017-05-18 5:38 ` [PATCH v2 00/29] gpu/drm: remove -Iinclude/drm compiler flags from Makefile Daniel Vetter
2017-05-18 5:38 ` Daniel Vetter
2017-05-19 12:39 ` Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1493009447-31524-17-git-send-email-yamada.masahiro@socionext.com \
--to=yamada.masahiro@socionext.com \
--cc=airlied@linux.ie \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=seanpaul@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.