aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/host1x/dev.c
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2013-09-30 08:17:39 -0400
committerThierry Reding <treding@nvidia.com>2013-10-31 04:55:41 -0400
commit5407f31bd37d1289dfd0a2a23a45c5ff2aec8e58 (patch)
tree3fb5e326c74693d083613568a2455a2b99f0e6e5 /drivers/gpu/host1x/dev.c
parent59d29c0ec93fe9879673b302a182fb3fb80896c3 (diff)
gpu: host1x: Add support for Tegra114
Tegra114 uses a slightly updated version of host1x with an additional syncpoint. Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu/host1x/dev.c')
-rw-r--r--drivers/gpu/host1x/dev.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c
index de0fd552710d..ab402a56284c 100644
--- a/drivers/gpu/host1x/dev.c
+++ b/drivers/gpu/host1x/dev.c
@@ -33,6 +33,7 @@
33#include "channel.h" 33#include "channel.h"
34#include "debug.h" 34#include "debug.h"
35#include "hw/host1x01.h" 35#include "hw/host1x01.h"
36#include "hw/host1x02.h"
36 37
37void host1x_sync_writel(struct host1x *host1x, u32 v, u32 r) 38void host1x_sync_writel(struct host1x *host1x, u32 v, u32 r)
38{ 39{
@@ -67,7 +68,17 @@ static const struct host1x_info host1x01_info = {
67 .sync_offset = 0x3000, 68 .sync_offset = 0x3000,
68}; 69};
69 70
71static const struct host1x_info host1x02_info = {
72 .nb_channels = 9,
73 .nb_pts = 32,
74 .nb_mlocks = 16,
75 .nb_bases = 12,
76 .init = host1x02_init,
77 .sync_offset = 0x3000,
78};
79
70static struct of_device_id host1x_of_match[] = { 80static struct of_device_id host1x_of_match[] = {
81 { .compatible = "nvidia,tegra114-host1x", .data = &host1x02_info, },
71 { .compatible = "nvidia,tegra30-host1x", .data = &host1x01_info, }, 82 { .compatible = "nvidia,tegra30-host1x", .data = &host1x01_info, },
72 { .compatible = "nvidia,tegra20-host1x", .data = &host1x01_info, }, 83 { .compatible = "nvidia,tegra20-host1x", .data = &host1x01_info, },
73 { }, 84 { },