From e1e906448d2fc6f5a69e1967e00868f0cbfbb566 Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Tue, 24 Sep 2013 13:59:01 +0200 Subject: [PATCH] gpu: host1x: Make host1x header file public 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 284969fa2896..89f347ae077f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2817,6 +2817,7 @@ L: linux-tegra@vger.kernel.org T: git git://anongit.freedesktop.org/tegra/linux.git S: Maintained 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 dd6b98b18640..78754f6a9153 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 f045f7c0a91c..2691e333e0e2 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 ee199623e365..c950bc655ade 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 a2bc1e65e972..fe09939800bc 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 -- 2.20.1