aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/host1x/dev.c
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2013-11-15 08:58:05 -0500
committerThierry Reding <treding@nvidia.com>2013-12-19 03:29:52 -0500
commite6fff4aaf99763da8a68b237e09cb8d47730f118 (patch)
treefa050b9b2fa9c620dd289f2ef4d96969b10a19ad /drivers/gpu/host1x/dev.c
parent23a0e27aacad6b97598dd6786f782e4b6dd86096 (diff)
gpu: host1x: Add Tegra124 support
Tegra124 has 192 syncpoints whereas its predecessors had 32 syncpoints. This required changes to the hardware register layout. Signed-off-by: Arto Merilainen <amerilainen@nvidia.com> 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 646a333b069a..2529908d304b 100644
--- a/drivers/gpu/host1x/dev.c
+++ b/drivers/gpu/host1x/dev.c
@@ -34,6 +34,7 @@
34#include "debug.h" 34#include "debug.h"
35#include "hw/host1x01.h" 35#include "hw/host1x01.h"
36#include "hw/host1x02.h" 36#include "hw/host1x02.h"
37#include "hw/host1x04.h"
37 38
38void host1x_sync_writel(struct host1x *host1x, u32 v, u32 r) 39void host1x_sync_writel(struct host1x *host1x, u32 v, u32 r)
39{ 40{
@@ -77,7 +78,17 @@ static const struct host1x_info host1x02_info = {
77 .sync_offset = 0x3000, 78 .sync_offset = 0x3000,
78}; 79};
79 80
81static const struct host1x_info host1x04_info = {
82 .nb_channels = 12,
83 .nb_pts = 192,
84 .nb_mlocks = 16,
85 .nb_bases = 64,
86 .init = host1x04_init,
87 .sync_offset = 0x2100,
88};
89
80static struct of_device_id host1x_of_match[] = { 90static struct of_device_id host1x_of_match[] = {
91 { .compatible = "nvidia,tegra124-host1x", .data = &host1x04_info, },
81 { .compatible = "nvidia,tegra114-host1x", .data = &host1x02_info, }, 92 { .compatible = "nvidia,tegra114-host1x", .data = &host1x02_info, },
82 { .compatible = "nvidia,tegra30-host1x", .data = &host1x01_info, }, 93 { .compatible = "nvidia,tegra30-host1x", .data = &host1x01_info, },
83 { .compatible = "nvidia,tegra20-host1x", .data = &host1x01_info, }, 94 { .compatible = "nvidia,tegra20-host1x", .data = &host1x01_info, },