aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArto Merilainen <amerilainen@nvidia.com>2013-10-14 08:21:55 -0400
committerThierry Reding <treding@nvidia.com>2013-10-31 04:55:48 -0400
commit61644dc7dfc5592cb136a633299ceef840bba303 (patch)
tree5a42dcbb1aa60b3af11d2e454c10f2ecbb8d4d66
parentc54a169b528d0ac2a5d3a7bf91f8534323bda83d (diff)
drm/tegra: Reserve base for gr2d
This patch modifies the gr2d to reserve a base for syncpoint. Signed-off-by: Arto Merilainen <amerilainen@nvidia.com> Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--drivers/gpu/drm/tegra/gr2d.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/tegra/gr2d.c b/drivers/gpu/drm/tegra/gr2d.c
index 3a04b97b54a2..7ec4259ffded 100644
--- a/drivers/gpu/drm/tegra/gr2d.c
+++ b/drivers/gpu/drm/tegra/gr2d.c
@@ -37,13 +37,14 @@ static int gr2d_init(struct host1x_client *client)
37{ 37{
38 struct tegra_drm_client *drm = host1x_to_drm_client(client); 38 struct tegra_drm_client *drm = host1x_to_drm_client(client);
39 struct tegra_drm *tegra = dev_get_drvdata(client->parent); 39 struct tegra_drm *tegra = dev_get_drvdata(client->parent);
40 unsigned long flags = HOST1X_SYNCPT_HAS_BASE;
40 struct gr2d *gr2d = to_gr2d(drm); 41 struct gr2d *gr2d = to_gr2d(drm);
41 42
42 gr2d->channel = host1x_channel_request(client->dev); 43 gr2d->channel = host1x_channel_request(client->dev);
43 if (!gr2d->channel) 44 if (!gr2d->channel)
44 return -ENOMEM; 45 return -ENOMEM;
45 46
46 client->syncpts[0] = host1x_syncpt_request(client->dev, 0); 47 client->syncpts[0] = host1x_syncpt_request(client->dev, flags);
47 if (!client->syncpts[0]) { 48 if (!client->syncpts[0]) {
48 host1x_channel_free(gr2d->channel); 49 host1x_channel_free(gr2d->channel);
49 return -ENOMEM; 50 return -ENOMEM;