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

drm/qxl: 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-13-git-send-email-yamada.masahiro@socionext.com
parent ae95621b
...@@ -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
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 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 obj-$(CONFIG_DRM_QXL)+= qxl.o
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include "drmP.h" #include <drm/drmP.h>
#include "qxl_drv.h" #include "qxl_drv.h"
#include "qxl_object.h" #include "qxl_object.h"
......
...@@ -23,16 +23,15 @@ ...@@ -23,16 +23,15 @@
* Alon Levy * Alon Levy
*/ */
#include <linux/crc32.h> #include <linux/crc32.h>
#include <drm/drm_crtc_helper.h>
#include "qxl_drv.h"
#include "qxl_object.h"
#include "drm_crtc_helper.h"
#include <drm/drm_plane_helper.h> #include <drm/drm_plane_helper.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_atomic.h> #include <drm/drm_atomic.h>
#include "qxl_drv.h"
#include "qxl_object.h"
static bool qxl_head_enabled(struct qxl_head *head) static bool qxl_head_enabled(struct qxl_head *head)
{ {
return head->width && head->height; return head->width && head->height;
......
...@@ -31,9 +31,9 @@ ...@@ -31,9 +31,9 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/console.h> #include <linux/console.h>
#include "drmP.h" #include <drm/drmP.h>
#include "drm/drm.h" #include <drm/drm.h>
#include "drm_crtc_helper.h" #include <drm/drm_crtc_helper.h>
#include "qxl_drv.h" #include "qxl_drv.h"
#include "qxl_object.h" #include "qxl_object.h"
......
...@@ -36,20 +36,18 @@ ...@@ -36,20 +36,18 @@
#include <linux/firmware.h> #include <linux/firmware.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include "drmP.h" #include <drm/drm_crtc.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_encoder.h> #include <drm/drm_encoder.h>
#include <drm/drm_gem.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 */ /* 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 <drm/qxl_drm.h>
#include "qxl_dev.h" #include "qxl_dev.h"
#define DRIVER_AUTHOR "Dave Airlie" #define DRIVER_AUTHOR "Dave Airlie"
......
...@@ -25,14 +25,15 @@ ...@@ -25,14 +25,15 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include "drmP.h" #include <drm/drmP.h>
#include "drm/drm.h" #include <drm/drm.h>
#include "drm/drm_crtc.h" #include <drm/drm_crtc.h>
#include "drm/drm_crtc_helper.h" #include <drm/drm_crtc_helper.h>
#include <drm/drm_fb_helper.h>
#include "qxl_drv.h" #include "qxl_drv.h"
#include "qxl_object.h" #include "qxl_object.h"
#include "drm_fb_helper.h"
#define QXL_DIRTY_DELAY (HZ / 30) #define QXL_DIRTY_DELAY (HZ / 30)
......
...@@ -23,8 +23,9 @@ ...@@ -23,8 +23,9 @@
* Alon Levy * Alon Levy
*/ */
#include "drmP.h" #include <drm/drmP.h>
#include "drm/drm.h" #include <drm/drm.h>
#include "qxl_drv.h" #include "qxl_drv.h"
#include "qxl_object.h" #include "qxl_object.h"
......
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
* Alon Levy * Alon Levy
*/ */
#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/qxl_drm.h> #include <drm/qxl_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