From patchwork Thu May 18 04:29:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 100041 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp544731qge; Wed, 17 May 2017 21:34:30 -0700 (PDT) X-Received: by 10.99.218.69 with SMTP id l5mr2376649pgj.88.1495082070449; Wed, 17 May 2017 21:34:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495082070; cv=none; d=google.com; s=arc-20160816; b=EivFdsMCq0cff0Nun3fgiJog2MiQhDMQvKF6xf2tcI1bh7LJeu5dTfTu881e1CPQjs 1GZUJ/aVwFAk1PkWj1RVUIQX0pvUVuHsbi7tUcXBYEvHThaXQbFei/CNBBPD4qSJXDB7 ys87yKRuNJDot2+bpOiQZhDOaXXMpYsLCIbriu0d/s/5CqEtnOoxROw7jDKlvy5/JLRY AUd1CqSQAdxz4FSdZSTuWQD+OyvICrlEeACexOuNGRwQvQ/RtSycePhPc2Ea2QD94Oww b7cc+pQ4huLmcKMlG7A3HZ3tzA8tWlniEpx7+8QJCPMVALhcv11gGlNawmLCVwIdsQe3 4D+Q== 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=dPNgkL/Lubzd6852DU13pWA+iMOTj/fPpaE4dJwj3rM=; b=C1MyKoOQwmY8gHZXlVHm7TUyfd9E3kYroVgmqpTL3w9khobvemPlki0NJyKFtp1pmj V+Qxx7TIB1XCbhr9jx++VCJEI5N2rI9O1mvtEBrIO1viOAw974bivd5OMm7VX7GieZaB NSdxRw45hYb+UFYSVXFqxiKU9MIJl4Z7AFQHybLgWiou5D0v7Lxhqam8y/L8fvaQ/vkE w4IPr/PzYMXY1O7VzlVWdMqqK92JwV1Ix37nvHZya9bCLOnWg0sgurYJORx1i2Q1dvC6 CGMjHC5ycsFEUDbgulfSgBdKqJO9Fg8LOb/6bhTSPxlWC1Anpcqq5S38nupm8ALE7dUP Vjrg== 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 p30si4016404pgn.165.2017.05.17.21.34.30; Wed, 17 May 2017 21:34: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 S1754085AbdEREbM (ORCPT + 25 others); Thu, 18 May 2017 00:31:12 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:37529 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753845AbdEREbH (ORCPT ); Thu, 18 May 2017 00:31:07 -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 v4I4U7cc023781; Thu, 18 May 2017 13:30:11 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com v4I4U7cc023781 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1495081812; bh=dPNgkL/Lubzd6852DU13pWA+iMOTj/fPpaE4dJwj3rM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BKnA67txyZj1nBl6sT0jJgxMKPqqbZhxqsLnGfYrxOCYvtaj4r8Nwzp8hZVnuUUcy 3DoiT8LIFdGbvM+qsqxLvQyfqgv7zY6wFNKBfrdNY5AjPEC4BHGT+EM7fBuQE6EGrP obTYDm32PgQu3m8mv7Q6aHaRG+0LkL8rLarJBJU26lF6CnHYULu+B607y1PE4LDq99 P3DQGNA0Gm+XTZVhg2vZ1xyWJx1CsF/449Fft6EKd7jO15FGQUKKWQU9h2iTktY03h cWUdhs59PbTRt0cuhFSswFHWOGtCzs8XZAub9CZhHYMcFCqznw6ndob8uluurkVVRX fhaLD46y2kzQg== 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 , Thomas Hellstrom , VMware Graphics , Sinclair Yeh Subject: [PATCH v3 03/16] drm/vmwgfx: fix include notation and remove -Iinclude/drm flag Date: Thu, 18 May 2017 13:29:40 +0900 Message-Id: <1495081793-9707-4-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/vmwgfx/Makefile | 3 --- drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 3 ++- drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 3 ++- drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 3 ++- drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 3 ++- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 3 ++- 7 files changed, 11 insertions(+), 9 deletions(-) -- 2.7.4 diff --git a/drivers/gpu/drm/vmwgfx/Makefile b/drivers/gpu/drm/vmwgfx/Makefile index aac17a6..a365330 100644 --- a/drivers/gpu/drm/vmwgfx/Makefile +++ b/drivers/gpu/drm/vmwgfx/Makefile @@ -1,6 +1,3 @@ - -ccflags-y := -Iinclude/drm - vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_kms.o vmwgfx_drv.o \ vmwgfx_fb.o vmwgfx_ioctl.o vmwgfx_resource.o vmwgfx_buffer.o \ vmwgfx_fifo.o vmwgfx_irq.o vmwgfx_ldu.o vmwgfx_ttm_glue.o \ diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c index 77cb7c6..99a7f4a 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c @@ -25,8 +25,9 @@ * **************************************************************************/ +#include + #include "vmwgfx_drv.h" -#include "ttm/ttm_bo_api.h" /* * Size of inline command buffers. Try to make sure that a page size is a diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c index 443d1ed..bcc6d41 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c @@ -25,10 +25,11 @@ * **************************************************************************/ +#include + #include "vmwgfx_drv.h" #include "vmwgfx_resource_priv.h" #include "vmwgfx_binding.h" -#include "ttm/ttm_placement.h" struct vmw_user_context { struct ttm_base_object base; diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c index 265c81e..6c026d7 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c @@ -30,9 +30,10 @@ * whenever the backing MOB is evicted. */ +#include + #include "vmwgfx_drv.h" #include "vmwgfx_resource_priv.h" -#include #include "vmwgfx_so.h" /** diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c index e57a0ba..6063c96 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c @@ -30,7 +30,7 @@ #include #include #include -#include "drmP.h" +#include #include "vmwgfx_msg.h" diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_shader.c b/drivers/gpu/drm/vmwgfx/vmwgfx_shader.c index 92f8b1d..68f135c 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_shader.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_shader.c @@ -25,10 +25,11 @@ * **************************************************************************/ +#include + #include "vmwgfx_drv.h" #include "vmwgfx_resource_priv.h" #include "vmwgfx_binding.h" -#include "ttm/ttm_placement.h" struct vmw_shader { struct vmw_resource res; diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c index 7681341..5900cff 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c @@ -25,11 +25,12 @@ * **************************************************************************/ +#include + #include "vmwgfx_drv.h" #include "vmwgfx_resource_priv.h" #include "vmwgfx_so.h" #include "vmwgfx_binding.h" -#include #include "device_include/svga3d_surfacedefs.h"