Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1e90644 authored by Thierry Reding's avatar Thierry Reding
Browse files

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: default avatarThierry Reding <treding@nvidia.com>
parent 3be82743

MAINTAINERS

+1 −0
Original line number Original line Diff line number Diff line
@@ -2817,6 +2817,7 @@ L: linux-tegra@vger.kernel.org 
T:	git git://anongit.freedesktop.org/tegra/linux.git

T:	git git://anongit.freedesktop.org/tegra/linux.git

S:	Maintained

S:	Maintained

F:	drivers/gpu/host1x/

F:	drivers/gpu/host1x/

F:	include/linux/host1x.h

F:	include/uapi/drm/tegra_drm.h

F:	include/uapi/drm/tegra_drm.h

F:	Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt

F:	Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt

drivers/gpu/host1x/drm/drm.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -10,14 +10,14 @@ 
#ifndef HOST1X_DRM_H

#ifndef HOST1X_DRM_H

#define HOST1X_DRM_H 1

#define HOST1X_DRM_H 1





#include <uapi/drm/tegra_drm.h>

#include <linux/host1x.h>



#include <drm/drmP.h>

#include <drm/drmP.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_edid.h>

#include <drm/drm_edid.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_fixed.h>

#include <drm/drm_fixed.h>

#include <uapi/drm/tegra_drm.h>



#include "host1x.h"





struct tegra_fb {

struct tegra_fb {

	struct drm_framebuffer base;

	struct drm_framebuffer base;

drivers/gpu/host1x/drm/gr2d.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include "drm.h"

#include "drm.h"

#include "gem.h"

#include "gem.h"

#include "job.h"

#include "job.h"

#include "host1x.h"

#include "host1x_bo.h"

#include "host1x_bo.h"

#include "host1x_client.h"

#include "host1x_client.h"

#include "syncpt.h"

#include "syncpt.h"

drivers/gpu/host1x/hw/channel_hw.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -16,10 +16,11 @@ 
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 */





#include <linux/host1x.h>

#include <linux/slab.h>

#include <linux/slab.h>



#include <trace/events/host1x.h>

#include <trace/events/host1x.h>





#include "host1x.h"

#include "host1x_bo.h"

#include "host1x_bo.h"

#include "channel.h"

#include "channel.h"

#include "dev.h"

#include "dev.h"

drivers/gpu/host1x/host1x.h→include/linux/host1x.h

+3 −5
Original line number Original line Diff line number Diff line 
/*

/*

 * Tegra host1x driver

 *

 * Copyright (c) 2009-2013, NVIDIA Corporation. All rights reserved.

 * Copyright (c) 2009-2013, NVIDIA Corporation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify
@@ -24,7 +22,7 @@ 
enum host1x_class {

enum host1x_class {

	HOST1X_CLASS_HOST1X = 0x1,

	HOST1X_CLASS_HOST1X = 0x1,

	HOST1X_CLASS_GR2D = 0x51,

	HOST1X_CLASS_GR2D = 0x51,

	HOST1X_CLASS_GR2D_SB    = 0x52

	HOST1X_CLASS_GR2D_SB = 0x52,

};

};





#endif
 
#endif