diff options
Diffstat (limited to 'drivers/gpu/nvgpu/os')
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/driver_common.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ioctl_as.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ioctl_channel.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/nvhost.c | 11 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/pci.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c | 2 |
6 files changed, 12 insertions, 10 deletions
diff --git a/drivers/gpu/nvgpu/os/linux/driver_common.c b/drivers/gpu/nvgpu/os/linux/driver_common.c index 539f0559..cf7877e2 100644 --- a/drivers/gpu/nvgpu/os/linux/driver_common.c +++ b/drivers/gpu/nvgpu/os/linux/driver_common.c | |||
@@ -92,6 +92,8 @@ static void nvgpu_init_vars(struct gk20a *g) | |||
92 | 92 | ||
93 | nvgpu_init_list_node(&g->boardobj_head); | 93 | nvgpu_init_list_node(&g->boardobj_head); |
94 | nvgpu_init_list_node(&g->boardobjgrp_head); | 94 | nvgpu_init_list_node(&g->boardobjgrp_head); |
95 | |||
96 | __nvgpu_set_enabled(g, NVGPU_HAS_SYNCPOINTS, platform->has_syncpoints); | ||
95 | } | 97 | } |
96 | 98 | ||
97 | static void nvgpu_init_gr_vars(struct gk20a *g) | 99 | static void nvgpu_init_gr_vars(struct gk20a *g) |
@@ -165,7 +167,6 @@ static void nvgpu_init_pm_vars(struct gk20a *g) | |||
165 | 167 | ||
166 | g->aggressive_sync_destroy = platform->aggressive_sync_destroy; | 168 | g->aggressive_sync_destroy = platform->aggressive_sync_destroy; |
167 | g->aggressive_sync_destroy_thresh = platform->aggressive_sync_destroy_thresh; | 169 | g->aggressive_sync_destroy_thresh = platform->aggressive_sync_destroy_thresh; |
168 | g->has_syncpoints = platform->has_syncpoints; | ||
169 | #ifdef CONFIG_NVGPU_SUPPORT_CDE | 170 | #ifdef CONFIG_NVGPU_SUPPORT_CDE |
170 | g->has_cde = platform->has_cde; | 171 | g->has_cde = platform->has_cde; |
171 | #endif | 172 | #endif |
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_as.c b/drivers/gpu/nvgpu/os/linux/ioctl_as.c index f63a2317..3fa8aa2c 100644 --- a/drivers/gpu/nvgpu/os/linux/ioctl_as.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_as.c | |||
@@ -281,7 +281,7 @@ static int nvgpu_as_ioctl_get_sync_ro_map( | |||
281 | if (!g->ops.fifo.get_sync_ro_map) | 281 | if (!g->ops.fifo.get_sync_ro_map) |
282 | return -EINVAL; | 282 | return -EINVAL; |
283 | 283 | ||
284 | if (!gk20a_platform_has_syncpoints(g)) | 284 | if (!nvgpu_has_syncpoints(g)) |
285 | return -EINVAL; | 285 | return -EINVAL; |
286 | 286 | ||
287 | err = g->ops.fifo.get_sync_ro_map(vm, &base_gpuva, &sync_size); | 287 | err = g->ops.fifo.get_sync_ro_map(vm, &base_gpuva, &sync_size); |
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_channel.c b/drivers/gpu/nvgpu/os/linux/ioctl_channel.c index dd69c590..45d49474 100644 --- a/drivers/gpu/nvgpu/os/linux/ioctl_channel.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_channel.c | |||
@@ -1014,7 +1014,7 @@ static int nvgpu_ioctl_channel_get_user_syncpoint(struct channel_gk20a *ch, | |||
1014 | return -EINVAL; | 1014 | return -EINVAL; |
1015 | } | 1015 | } |
1016 | 1016 | ||
1017 | if (!gk20a_platform_has_syncpoints(g)) { | 1017 | if (!nvgpu_has_syncpoints(g)) { |
1018 | nvgpu_err(g, "syncpoints not supported"); | 1018 | nvgpu_err(g, "syncpoints not supported"); |
1019 | return -EINVAL; | 1019 | return -EINVAL; |
1020 | } | 1020 | } |
diff --git a/drivers/gpu/nvgpu/os/linux/nvhost.c b/drivers/gpu/nvgpu/os/linux/nvhost.c index ccb830cc..2becae54 100644 --- a/drivers/gpu/nvgpu/os/linux/nvhost.c +++ b/drivers/gpu/nvgpu/os/linux/nvhost.c | |||
@@ -21,6 +21,7 @@ | |||
21 | 21 | ||
22 | #include <nvgpu/gk20a.h> | 22 | #include <nvgpu/gk20a.h> |
23 | #include <nvgpu/nvhost.h> | 23 | #include <nvgpu/nvhost.h> |
24 | #include <nvgpu/enabled.h> | ||
24 | 25 | ||
25 | #include "nvhost_priv.h" | 26 | #include "nvhost_priv.h" |
26 | 27 | ||
@@ -45,9 +46,9 @@ int nvgpu_get_nvhost_dev(struct gk20a *g) | |||
45 | } | 46 | } |
46 | 47 | ||
47 | } else { | 48 | } else { |
48 | if (g->has_syncpoints) { | 49 | if (nvgpu_has_syncpoints(g)) { |
49 | nvgpu_warn(g, "host1x reference not found. assuming no syncpoints support"); | 50 | nvgpu_warn(g, "host1x reference not found. assuming no syncpoints support"); |
50 | g->has_syncpoints = false; | 51 | __nvgpu_set_enabled(g, NVGPU_HAS_SYNCPOINTS, false); |
51 | } | 52 | } |
52 | return 0; | 53 | return 0; |
53 | } | 54 | } |
@@ -263,13 +264,13 @@ int nvgpu_nvhost_syncpt_init(struct gk20a *g) | |||
263 | { | 264 | { |
264 | int err = 0; | 265 | int err = 0; |
265 | 266 | ||
266 | if (!g->has_syncpoints) | 267 | if (!nvgpu_has_syncpoints(g)) |
267 | return -ENOSYS; | 268 | return -ENOSYS; |
268 | 269 | ||
269 | err = nvgpu_get_nvhost_dev(g); | 270 | err = nvgpu_get_nvhost_dev(g); |
270 | if (err) { | 271 | if (err) { |
271 | nvgpu_err(g, "host1x device not available"); | 272 | nvgpu_err(g, "host1x device not available"); |
272 | g->has_syncpoints = false; | 273 | __nvgpu_set_enabled(g, NVGPU_HAS_SYNCPOINTS, false); |
273 | return -ENOSYS; | 274 | return -ENOSYS; |
274 | } | 275 | } |
275 | 276 | ||
@@ -279,7 +280,7 @@ int nvgpu_nvhost_syncpt_init(struct gk20a *g) | |||
279 | &g->syncpt_unit_size); | 280 | &g->syncpt_unit_size); |
280 | if (err) { | 281 | if (err) { |
281 | nvgpu_err(g, "Failed to get syncpt interface"); | 282 | nvgpu_err(g, "Failed to get syncpt interface"); |
282 | g->has_syncpoints = false; | 283 | __nvgpu_set_enabled(g, NVGPU_HAS_SYNCPOINTS, false); |
283 | return -ENOSYS; | 284 | return -ENOSYS; |
284 | } | 285 | } |
285 | 286 | ||
diff --git a/drivers/gpu/nvgpu/os/linux/pci.c b/drivers/gpu/nvgpu/os/linux/pci.c index 3b73b539..2e456abc 100644 --- a/drivers/gpu/nvgpu/os/linux/pci.c +++ b/drivers/gpu/nvgpu/os/linux/pci.c | |||
@@ -795,7 +795,7 @@ static int nvgpu_pci_probe(struct pci_dev *pdev, | |||
795 | } | 795 | } |
796 | /* Enable Semaphore SHIM on nvlink only for now. */ | 796 | /* Enable Semaphore SHIM on nvlink only for now. */ |
797 | __nvgpu_set_enabled(g, NVGPU_SUPPORT_NVLINK, false); | 797 | __nvgpu_set_enabled(g, NVGPU_SUPPORT_NVLINK, false); |
798 | g->has_syncpoints = false; | 798 | __nvgpu_set_enabled(g, NVGPU_HAS_SYNCPOINTS, false); |
799 | } else { | 799 | } else { |
800 | err = nvgpu_nvhost_syncpt_init(g); | 800 | err = nvgpu_nvhost_syncpt_init(g); |
801 | if (err) { | 801 | if (err) { |
diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c index 9cb40fb4..e01178ed 100644 --- a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c | |||
@@ -80,7 +80,7 @@ static void vgpu_init_vars(struct gk20a *g, struct gk20a_platform *platform) | |||
80 | 80 | ||
81 | g->aggressive_sync_destroy = platform->aggressive_sync_destroy; | 81 | g->aggressive_sync_destroy = platform->aggressive_sync_destroy; |
82 | g->aggressive_sync_destroy_thresh = platform->aggressive_sync_destroy_thresh; | 82 | g->aggressive_sync_destroy_thresh = platform->aggressive_sync_destroy_thresh; |
83 | g->has_syncpoints = platform->has_syncpoints; | 83 | __nvgpu_set_enabled(g, NVGPU_HAS_SYNCPOINTS, platform->has_syncpoints); |
84 | g->ptimer_src_freq = platform->ptimer_src_freq; | 84 | g->ptimer_src_freq = platform->ptimer_src_freq; |
85 | __nvgpu_set_enabled(g, NVGPU_CAN_RAILGATE, platform->can_railgate_init); | 85 | __nvgpu_set_enabled(g, NVGPU_CAN_RAILGATE, platform->can_railgate_init); |
86 | g->railgate_delay = platform->railgate_delay_init; | 86 | g->railgate_delay = platform->railgate_delay_init; |