aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/host1x/drm
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2013-09-24 10:30:32 -0400
committerThierry Reding <treding@nvidia.com>2013-10-31 04:20:11 -0400
commit35d747a81d7eb824bd0c3476cd0c564b52ad5353 (patch)
tree75bf333cba5d9dfbce532bb0c1391ca9bbeb7b43 /drivers/gpu/host1x/drm
parent53fa7f7204c97dc0c86b99ff8365ad6a7b2ebd78 (diff)
gpu: host1x: Expose syncpt and channel functionality
Expose the buffer objects, syncpoint and channel functionality in the public public header so that drivers can use them. Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu/host1x/drm')
-rw-r--r--drivers/gpu/host1x/drm/drm.c2
-rw-r--r--drivers/gpu/host1x/drm/gem.h4
-rw-r--r--drivers/gpu/host1x/drm/gr2d.c6
-rw-r--r--drivers/gpu/host1x/drm/hdmi.c2
4 files changed, 4 insertions, 10 deletions
diff --git a/drivers/gpu/host1x/drm/drm.c b/drivers/gpu/host1x/drm/drm.c
index 33d966145293..1abcdbc7f4cd 100644
--- a/drivers/gpu/host1x/drm/drm.c
+++ b/drivers/gpu/host1x/drm/drm.c
@@ -8,10 +8,8 @@
8 */ 8 */
9 9
10#include "host1x_client.h" 10#include "host1x_client.h"
11#include "dev.h"
12#include "drm.h" 11#include "drm.h"
13#include "gem.h" 12#include "gem.h"
14#include "syncpt.h"
15 13
16#define DRIVER_NAME "tegra" 14#define DRIVER_NAME "tegra"
17#define DRIVER_DESC "NVIDIA Tegra graphics" 15#define DRIVER_DESC "NVIDIA Tegra graphics"
diff --git a/drivers/gpu/host1x/drm/gem.h b/drivers/gpu/host1x/drm/gem.h
index 492533a2dacb..2b54f1425d5e 100644
--- a/drivers/gpu/host1x/drm/gem.h
+++ b/drivers/gpu/host1x/drm/gem.h
@@ -19,11 +19,11 @@
19#ifndef __HOST1X_GEM_H 19#ifndef __HOST1X_GEM_H
20#define __HOST1X_GEM_H 20#define __HOST1X_GEM_H
21 21
22#include <linux/host1x.h>
23
22#include <drm/drm.h> 24#include <drm/drm.h>
23#include <drm/drmP.h> 25#include <drm/drmP.h>
24 26
25#include "host1x_bo.h"
26
27struct tegra_bo { 27struct tegra_bo {
28 struct drm_gem_object gem; 28 struct drm_gem_object gem;
29 struct host1x_bo base; 29 struct host1x_bo base;
diff --git a/drivers/gpu/host1x/drm/gr2d.c b/drivers/gpu/host1x/drm/gr2d.c
index a7edc794c5ce..dfb822428ca0 100644
--- a/drivers/gpu/host1x/drm/gr2d.c
+++ b/drivers/gpu/host1x/drm/gr2d.c
@@ -16,13 +16,9 @@
16 16
17#include <linux/clk.h> 17#include <linux/clk.h>
18 18
19#include "channel.h" 19#include "host1x_client.h"
20#include "drm.h" 20#include "drm.h"
21#include "gem.h" 21#include "gem.h"
22#include "job.h"
23#include "host1x_bo.h"
24#include "host1x_client.h"
25#include "syncpt.h"
26 22
27#define GR2D_NUM_REGS 0x4d 23#define GR2D_NUM_REGS 0x4d
28 24
diff --git a/drivers/gpu/host1x/drm/hdmi.c b/drivers/gpu/host1x/drm/hdmi.c
index 30ac9e872b0d..a2370045993c 100644
--- a/drivers/gpu/host1x/drm/hdmi.c
+++ b/drivers/gpu/host1x/drm/hdmi.c
@@ -13,10 +13,10 @@
13#include <linux/hdmi.h> 13#include <linux/hdmi.h>
14#include <linux/regulator/consumer.h> 14#include <linux/regulator/consumer.h>
15 15
16#include "host1x_client.h"
16#include "hdmi.h" 17#include "hdmi.h"
17#include "drm.h" 18#include "drm.h"
18#include "dc.h" 19#include "dc.h"
19#include "host1x_client.h"
20 20
21struct tegra_hdmi { 21struct tegra_hdmi {
22 struct tegra_drm_client client; 22 struct tegra_drm_client client;