From patchwork Thu May 18 04:29:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 100036 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp544484qge; Wed, 17 May 2017 21:33:30 -0700 (PDT) X-Received: by 10.99.98.66 with SMTP id w63mr2219384pgb.223.1495082010160; Wed, 17 May 2017 21:33:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495082010; cv=none; d=google.com; s=arc-20160816; b=VGdbXxd3AMmqcEo8vG8Lr8wy/qTlxIArL6GG9UyKCIw5OBTgJyGdBbAI9Mdg0CjZ/J 2oHZ5f38v5dF22LCiakWGlP7ikucPGPP+yEzk0UJoGurXE/zqX/h361OYaQHz4J17Art mzA08+UydAjt9jsQ13S7hfaI1jNlgPAkollzkpZwA1V5dPlKaFexjdTUPMQY2xCPRqrb 6M9JVnu+A+hIauvuPdrn/qeu0WiFudWa2tU7AeH77hnZZICEPKwkOJlmZW1Wv+PZYcJs iEC1tK6OiXJQN804Xp90du/Qb6L1A7wHNlDyO0E9u8pWg/da+dlogH8haz7AwtdV8PEj MAng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=rEp71frw6bqw+9wAIH2KefgOk6B3paKnQulXcWCSW0g=; b=wE5S3Xv2RKYp94WqGJD09xRurlaF4DU0JLlOtIB+KzyIKue1X/Z/3gMV8gE5AMl6JW 4O2QAbJqf9eieGquL3Up5i453r6i0o/3t3O9HddD8SgAD7HMlzbCBbjh5L2NCixA2jRR fd6QbmZB1RHdTJfnpeqyEr0HkPtqkVmLzdysTOVeNcx8LXUtk3ao76uNxH3BK45J72z2 ajkiaHB2CIvbFvxojiQcIbPMtvlLSatKmIsevVApbEPVflCcSb0UjEpYPFZHp7ersBZJ UphFzhkZ17CnXzg/bHYVzwpjNecvBv9OuN8qUlmZqOyxsdCSQnsalU/Y4LUodYl0HD02 sd6A== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b78si4003396pfe.220.2017.05.17.21.33.29; Wed, 17 May 2017 21:33:30 -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 S1754796AbdEREdG (ORCPT + 25 others); Thu, 18 May 2017 00:33:06 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:37797 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754337AbdEREbT (ORCPT ); Thu, 18 May 2017 00:31:19 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id v4I4U7cb023781; Thu, 18 May 2017 13:30:10 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com v4I4U7cb023781 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1495081811; bh=rEp71frw6bqw+9wAIH2KefgOk6B3paKnQulXcWCSW0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fgA2TrXRugX/+w9ESz26aj5p+PpAD6AQVknS4hBp9PtFoqF0B0KZPXbirMloQPjc7 cFkeXRfJA0sZ5AhJ/Rep1y6Dd7Zc+Z7fdGJAZ+t8j+pj6A39USurWMmpnr8bY/YGX7 o6E86Amy7QHHtkMFcUda2tOtNGp+aF9bGVUO/iuuZD6xxi7I8mqPAvD2b8HKzF+upW QW3rnekjJTmlYNekj68rG7Rdd3zeSA8Xo8fonY400epSf/tQEMCNzwJ1rIACLztGA4 3LUl/hUalzKsXcCxysJe9W8G+bqWfO4whWc0C9LUn7EWptMtSnJBGpkQ2dF2Dhaa3K ugJ0cKn8wQWwQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: dri-devel@lists.freedesktop.org, Daniel Vetter Cc: David Airlie , Jani Nikula , Sean Paul , linux-kernel@vger.kernel.org, Masahiro Yamada , Gerd Hoffmann , virtualization@lists.linux-foundation.org Subject: [PATCH v3 02/16] drm/virtio: fix include notation and remove -Iinclude/drm flag Date: Thu, 18 May 2017 13:29:39 +0900 Message-Id: <1495081793-9707-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495081793-9707-1-git-send-email-yamada.masahiro@socionext.com> References: <1495081793-9707-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 v3: 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(-) -- 2.7.4 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 +#include -#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 #include #include -#include "drmP.h" -#include "drm/drm.h" +#include +#include #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 #include #include -#include -#include -#include -#include +#include +#include +#include +#include #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 -#include "virtgpu_drv.h" #include -#include "ttm/ttm_execbuf_util.h" +#include + +#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 -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include