summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common
diff options
context:
space:
mode:
authorRichard Zhao <rizhao@nvidia.com>2017-06-22 13:40:32 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-06-24 23:05:53 -0400
commitf2f68430372d42be0b51b7475d8b8236894d96f5 (patch)
tree5466527881ae83d5c671d5e390e160816729150e /drivers/gpu/nvgpu/common
parent102c512082b8810c4b50ab0266748ec6776b76d8 (diff)
gpu: nvgpu: assume no syncpt support if no "nvidia,host1x" in dt
It'll let gpu tests pass by using sem before enabling syncpt. Especially for vgpu, the plat data is shared across different GPUs, so we can use dt to override and disable syncpt. Jira VFND-3796 Change-Id: I2cc32a1ea1cc1097047427eb1e52ec50c3a0bf90 Signed-off-by: Richard Zhao <rizhao@nvidia.com> Reviewed-on: http://git-master/r/1507494 Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com> Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com> Reviewed-by: Nirav Patel <nipatel@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common')
-rw-r--r--drivers/gpu/nvgpu/common/linux/nvhost.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/nvhost.c b/drivers/gpu/nvgpu/common/linux/nvhost.c
index 19e41e17..e190096e 100644
--- a/drivers/gpu/nvgpu/common/linux/nvhost.c
+++ b/drivers/gpu/nvgpu/common/linux/nvhost.c
@@ -42,8 +42,11 @@ int nvgpu_get_nvhost_dev(struct gk20a *g)
42 } 42 }
43 43
44 } else { 44 } else {
45 host1x_pdev = to_platform_device(g->dev->parent); 45 if (g->has_syncpoints) {
46 dev_warn(g->dev, "host1x reference not found. assuming host1x to be parent"); 46 dev_warn(g->dev, "host1x reference not found. assuming no syncpoints support\n");
47 g->has_syncpoints = false;
48 }
49 return 0;
47 } 50 }
48 51
49 g->nvhost_dev = nvgpu_kzalloc(g, sizeof(struct nvgpu_nvhost_dev)); 52 g->nvhost_dev = nvgpu_kzalloc(g, sizeof(struct nvgpu_nvhost_dev));