Commit ff67a25d authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Daniel Vetter

drm/virtio: fix include notation and remove -Iinclude/drm flag

Include <drm/*.h> instead of relative path from include/drm, then
remove the -Iinclude/drm compiler flag.
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1493009447-31524-17-git-send-email-yamada.masahiro@socionext.com
parent bb2af9bd
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
# Makefile for the drm device driver. This driver provides support for the # Makefile for the drm device driver. This driver provides support for the
# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. # 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 \ 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_fb.o virtgpu_display.o virtgpu_vq.o virtgpu_ttm.o \
virtgpu_fence.o virtgpu_object.o virtgpu_debugfs.o virtgpu_plane.o \ virtgpu_fence.o virtgpu_object.o virtgpu_debugfs.o virtgpu_plane.o \
......
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
*/ */
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <drm/drmP.h>
#include "drmP.h"
#include "virtgpu_drv.h" #include "virtgpu_drv.h"
static int static int
......
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/pci.h> #include <linux/pci.h>
#include "drmP.h" #include <drm/drmP.h>
#include "drm/drm.h" #include <drm/drm.h>
#include "virtgpu_drv.h" #include "virtgpu_drv.h"
static struct drm_driver driver; static struct drm_driver driver;
......
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
#include <drm/drm_atomic.h> #include <drm/drm_atomic.h>
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>
#include <drm/drm_encoder.h> #include <drm/drm_encoder.h>
#include <ttm/ttm_bo_api.h> #include <drm/ttm/ttm_bo_api.h>
#include <ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_bo_driver.h>
#include <ttm/ttm_placement.h> #include <drm/ttm/ttm_placement.h>
#include <ttm/ttm_module.h> #include <drm/ttm/ttm_module.h>
#define DRIVER_NAME "virtio_gpu" #define DRIVER_NAME "virtio_gpu"
#define DRIVER_DESC "virtio GPU" #define DRIVER_DESC "virtio GPU"
......
...@@ -26,9 +26,10 @@ ...@@ -26,9 +26,10 @@
*/ */
#include <drm/drmP.h> #include <drm/drmP.h>
#include "virtgpu_drv.h"
#include <drm/virtgpu_drm.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, static void convert_to_hw_box(struct virtio_gpu_box *dst,
const struct drm_virtgpu_3d_box *src) const struct drm_virtgpu_3d_box *src)
......
...@@ -25,11 +25,11 @@ ...@@ -25,11 +25,11 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include <ttm/ttm_bo_api.h> #include <drm/ttm/ttm_bo_api.h>
#include <ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_bo_driver.h>
#include <ttm/ttm_placement.h> #include <drm/ttm/ttm_placement.h>
#include <ttm/ttm_page_alloc.h> #include <drm/ttm/ttm_page_alloc.h>
#include <ttm/ttm_module.h> #include <drm/ttm/ttm_module.h>
#include <drm/drmP.h> #include <drm/drmP.h>
#include <drm/drm.h> #include <drm/drm.h>
#include <drm/virtgpu_drm.h> #include <drm/virtgpu_drm.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment