From patchwork Thu Apr 20 09:56:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 9691625 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0F1B8601A1 for ; Fri, 21 Apr 2017 01:10:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0128D201A4 for ; Fri, 21 Apr 2017 01:10:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E8C662846A; Fri, 21 Apr 2017 01:10:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8ABD0201A4 for ; Fri, 21 Apr 2017 01:10:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 543946E393; Fri, 21 Apr 2017 01:09:01 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from condef-03.nifty.com (condef-03.nifty.com [202.248.20.68]) by gabe.freedesktop.org (Postfix) with ESMTPS id EC8CE6E3A4 for ; Thu, 20 Apr 2017 10:09:28 +0000 (UTC) Received: from conuserg-11.nifty.com ([10.126.8.74])by condef-03.nifty.com with ESMTP id v3K9wU73008450 for ; Thu, 20 Apr 2017 18:58:30 +0900 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-11.nifty.com with ESMTP id v3K9vLBD027239; Thu, 20 Apr 2017 18:57:32 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com v3K9vLBD027239 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1492682253; bh=yGOcs4aFSAv9l0BwBGFOjhvo/sJbSZ5bPKiXe7EJvAU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o3/mFEa2Ljgmy2ITQNqS3gdTrmLNP3zVA4OcePVevHh+OW+I6h/q7d9nkljV2dNLA fCIWKe7QNFoPD5PyzX17LMFH1h6A0zDVIjUDZ8GKwPilXbhOe+KoHlZBhAPDXCBlN5 pwiNXnUOiMkf+Ra/Oy+jUC5U0AMOb7mfZ0WONiSNiXHnbjmmE/J/ch8l/mNK4ROcyQ HUxES3Adsw6K9M0doucDRu5383irpAYLwlT0290MnzXSaLWOpAJW7zEtwdGaAfB7Ve D3mmb5NzaQELY6flA+psfLlhiguRpzXh1guKvjT67ubtINUi/OzrlagDxYaui+D6im Psaqmq+3D8sLA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: dri-devel@lists.freedesktop.org, David Airlie , Daniel Vetter , Jani Nikula , Sean Paul Subject: [PATCH 11/28] drm/qxl: fix include notation and remove -Iinclude/drm flag Date: Thu, 20 Apr 2017 18:56:55 +0900 Message-Id: <1492682232-29769-12-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1492682232-29769-1-git-send-email-yamada.masahiro@socionext.com> References: <1492682232-29769-1-git-send-email-yamada.masahiro@socionext.com> X-Mailman-Approved-At: Fri, 21 Apr 2017 01:08:41 +0000 Cc: Masahiro Yamada , linux-kernel@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Include instead of relative path from include/drm, then remove the -Iinclude/drm compiler flag. Signed-off-by: Masahiro Yamada Reviewed-by: Gabriel Krisman Bertazi --- 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 -#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..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 #include #include #include 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..0297d1f 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.h +++ b/drivers/gpu/drm/qxl/qxl_drv.h @@ -36,18 +36,18 @@ #include #include -#include "drmP.h" -#include "drm_crtc.h" -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include /* just for ttm_validate_buffer */ -#include +#include #include #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 -#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