From patchwork Mon Oct 7 08:34:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 2995041 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F2DD3BF924 for ; Mon, 7 Oct 2013 08:48:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D0406201BF for ; Mon, 7 Oct 2013 08:48:46 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2C09A20173 for ; Mon, 7 Oct 2013 08:48:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 20DB2E6FD3 for ; Mon, 7 Oct 2013 01:48:42 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-bk0-f47.google.com (mail-bk0-f47.google.com [209.85.214.47]) by gabe.freedesktop.org (Postfix) with ESMTP id 1813EE61CF for ; Mon, 7 Oct 2013 01:36:59 -0700 (PDT) Received: by mail-bk0-f47.google.com with SMTP id mx12so2443194bkb.6 for ; Mon, 07 Oct 2013 01:36:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7CTIeIS2tQVplUkXcIFcXHqzNCtV5JEwtbx/nSvZjHU=; b=HrU/pOQa2SLH+hECOwXOJRRWs9g6xT7sHVCLEJkgAyV6uTPNedoxoKDJCw7E7737vD BtYllggNabW0NzUi0iAufG1RKKr7ZVajYXm/ybhsAw9l1wGHfZJyHQphqzHL3raDW1jo OGhnK19p/kx+v66jRZcxDfAwxA8t7DjgqK3v5EEShxpKB5WUImxSsSOu/Z8yYpTdxMlG +uhMczVKCt5qAAlcGJmQiiTAJntcwqPZUfF5wQnRy95+GtzrnwWks4dl7k3xOceAXq+t y9LrygKGvQPgMZoeoyCUZrDjh3D5N1EP1B04JwHhT5GCa4/9/LJDQkJuLPsKDUxDETd6 PNkg== X-Received: by 10.204.64.78 with SMTP id d14mr490380bki.40.1381135019102; Mon, 07 Oct 2013 01:36:59 -0700 (PDT) Received: from localhost (port-46445.pppoe.wtnet.de. [46.59.230.36]) by mx.google.com with ESMTPSA id b7sm16342212bkg.1.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 07 Oct 2013 01:36:58 -0700 (PDT) From: Thierry Reding To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 10/27] gpu: host1x: Make host1x header file public Date: Mon, 7 Oct 2013 10:34:27 +0200 Message-Id: <1381134884-5816-11-git-send-email-treding@nvidia.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1381134884-5816-1-git-send-email-treding@nvidia.com> References: <1381134884-5816-1-git-send-email-treding@nvidia.com> Cc: linux-tegra@vger.kernel.org, devicetree@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In preparation to support host1x clients other than DRM, move this header into a public location. Signed-off-by: Thierry Reding --- MAINTAINERS | 1 + drivers/gpu/host1x/drm/drm.h | 6 +++--- drivers/gpu/host1x/drm/gr2d.c | 1 - drivers/gpu/host1x/hw/channel_hw.c | 3 ++- {drivers/gpu/host1x => include/linux}/host1x.h | 8 +++----- 5 files changed, 9 insertions(+), 10 deletions(-) rename {drivers/gpu/host1x => include/linux}/host1x.h (88%) diff --git a/MAINTAINERS b/MAINTAINERS index 0df0af2..a1a4c7c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2812,6 +2812,7 @@ L: linux-tegra@vger.kernel.org T: git git://anongit.freedesktop.org/tegra/linux.git S: Supported F: drivers/gpu/host1x/ +F: include/linux/host1x.h F: include/uapi/drm/tegra_drm.h F: Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt diff --git a/drivers/gpu/host1x/drm/drm.h b/drivers/gpu/host1x/drm/drm.h index dd6b98b..78754f6 100644 --- a/drivers/gpu/host1x/drm/drm.h +++ b/drivers/gpu/host1x/drm/drm.h @@ -10,14 +10,14 @@ #ifndef HOST1X_DRM_H #define HOST1X_DRM_H 1 +#include +#include + #include #include #include #include #include -#include - -#include "host1x.h" struct tegra_fb { struct drm_framebuffer base; diff --git a/drivers/gpu/host1x/drm/gr2d.c b/drivers/gpu/host1x/drm/gr2d.c index 07f0425..fc4476d 100644 --- a/drivers/gpu/host1x/drm/gr2d.c +++ b/drivers/gpu/host1x/drm/gr2d.c @@ -20,7 +20,6 @@ #include "drm.h" #include "gem.h" #include "job.h" -#include "host1x.h" #include "host1x_bo.h" #include "host1x_client.h" #include "syncpt.h" diff --git a/drivers/gpu/host1x/hw/channel_hw.c b/drivers/gpu/host1x/hw/channel_hw.c index ee19962..c950bc6 100644 --- a/drivers/gpu/host1x/hw/channel_hw.c +++ b/drivers/gpu/host1x/hw/channel_hw.c @@ -16,10 +16,11 @@ * along with this program. If not, see . */ +#include #include + #include -#include "host1x.h" #include "host1x_bo.h" #include "channel.h" #include "dev.h" diff --git a/drivers/gpu/host1x/host1x.h b/include/linux/host1x.h similarity index 88% rename from drivers/gpu/host1x/host1x.h rename to include/linux/host1x.h index a2bc1e6..fe09939 100644 --- a/drivers/gpu/host1x/host1x.h +++ b/include/linux/host1x.h @@ -1,6 +1,4 @@ /* - * Tegra host1x driver - * * Copyright (c) 2009-2013, NVIDIA Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -22,9 +20,9 @@ #define __LINUX_HOST1X_H enum host1x_class { - HOST1X_CLASS_HOST1X = 0x1, - HOST1X_CLASS_GR2D = 0x51, - HOST1X_CLASS_GR2D_SB = 0x52 + HOST1X_CLASS_HOST1X = 0x1, + HOST1X_CLASS_GR2D = 0x51, + HOST1X_CLASS_GR2D_SB = 0x52, }; #endif