From patchwork Mon Apr 24 04:50:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 98000 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1321515qgf; Sun, 23 Apr 2017 21:57:35 -0700 (PDT) X-Received: by 10.99.145.200 with SMTP id l191mr22723052pge.123.1493009855909; Sun, 23 Apr 2017 21:57:35 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c2si17587110plb.188.2017.04.23.21.57.35; Sun, 23 Apr 2017 21:57:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1165116AbdDXE5c (ORCPT + 15 others); Mon, 24 Apr 2017 00:57:32 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:48522 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1164715AbdDXEvz (ORCPT ); Mon, 24 Apr 2017 00:51:55 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id v3O4oqMp025903; Mon, 24 Apr 2017 13:51:00 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com v3O4oqMp025903 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1493009460; bh=65dn6vKC31G/qg42YC3PinHaN5tRgRN3rsVlznccxVA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y2ESY2BR0MurRK3lyAGQ7wR9nIX/mhSi6WnzCB1liJ3i4JV65M66pdYctYpSkMBVM ZpBNzNT0BZDOqx1SxuOVvcP32grAApjAbI/7p8efjDdCiygoQe0GO14oXtLhB+FPqL 68xLUABVcvPY+f1linsS5Xz8cfRGR0wchyZG7Pcj0rxFdsIsjw8xqMj6iQQnYIcild OqE+NChjp+NcyANkVikqsBwDa4fRz19zXTm82MAyVKhNqg8xiUTHBWJ1A5061ggjcS mPN5MeWoiwsb2o/dyoRDTAkQP9GbQ7vTlNZKlEFrGIxriQL/GZwIb8WWwhaJEH+utN PK6mAT9RzvcMQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: dri-devel@lists.freedesktop.org, David Airlie , Daniel Vetter , Jani Nikula , Sean Paul Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH v2 12/29] drm/qxl: fix include notation and remove -Iinclude/drm flag Date: Mon, 24 Apr 2017 13:50:30 +0900 Message-Id: <1493009447-31524-13-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493009447-31524-1-git-send-email-yamada.masahiro@socionext.com> References: <1493009447-31524-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Include instead of relative path from include/drm, then remove the -Iinclude/drm compiler flag. Signed-off-by: Masahiro Yamada --- 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(-) -- 2.7.4 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 -#include "drmP.h" +#include #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 - -#include "qxl_drv.h" -#include "qxl_object.h" -#include "drm_crtc_helper.h" +#include #include #include #include +#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 #include -#include "drmP.h" -#include "drm/drm.h" -#include "drm_crtc_helper.h" +#include +#include +#include #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 #include -#include "drmP.h" -#include "drm_crtc.h" -#include -#include -#include -#include - +#include #include #include - +#include +#include +#include /* just for ttm_validate_buffer */ -#include - +#include +#include +#include #include + #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 -#include "drmP.h" -#include "drm/drm.h" -#include "drm/drm_crtc.h" -#include "drm/drm_crtc_helper.h" +#include +#include +#include +#include +#include + #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 +#include + #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 -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include