diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-04-13 16:05:37 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-04-13 16:16:54 -0400 |
commit | 2a57c10e4b83ff397d3b4053c5806f152885ca20 (patch) | |
tree | 25ad6e1e12c03346923e72e0b4940303253ce42e /drivers/gpu | |
parent | f72d655eac654cdcb78596d5ec61313ff3389e3c (diff) |
Revert "gpu: nvgpu: vgpu: support reduced BAR1 range"
This reverts commit 2adf9164d9d68cc3ab700af84724034682f44ab8.
Change-Id: I3f34fe3f7353d57da576cb90ca704d375b45ef63
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1126311
Reviewed-by: Adeel Raza <araza@nvidia.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/fifo_vgpu.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c index fe231003..ac506a34 100644 --- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c | |||
@@ -233,7 +233,6 @@ clean_up: | |||
233 | static int vgpu_init_fifo_setup_sw(struct gk20a *g) | 233 | static int vgpu_init_fifo_setup_sw(struct gk20a *g) |
234 | { | 234 | { |
235 | struct gk20a_platform *platform = gk20a_get_platform(g->dev); | 235 | struct gk20a_platform *platform = gk20a_get_platform(g->dev); |
236 | struct resource *r = platform_get_resource(g->dev, IORESOURCE_MEM, 0); | ||
237 | struct fifo_gk20a *f = &g->fifo; | 236 | struct fifo_gk20a *f = &g->fifo; |
238 | struct device *d = dev_from_gk20a(g); | 237 | struct device *d = dev_from_gk20a(g); |
239 | int chid, err = 0; | 238 | int chid, err = 0; |
@@ -271,11 +270,6 @@ static int vgpu_init_fifo_setup_sw(struct gk20a *g) | |||
271 | goto clean_up; | 270 | goto clean_up; |
272 | } | 271 | } |
273 | 272 | ||
274 | /* if reduced BAR1 range is specified, use offset of 0 | ||
275 | (server returns offset assuming full BAR1 range) */ | ||
276 | if (resource_size(r) == (resource_size_t)f->userd.size) | ||
277 | f->userd.gpu_va = 0; | ||
278 | |||
279 | gk20a_dbg(gpu_dbg_map, "userd bar1 va = 0x%llx", f->userd.gpu_va); | 273 | gk20a_dbg(gpu_dbg_map, "userd bar1 va = 0x%llx", f->userd.gpu_va); |
280 | 274 | ||
281 | f->channel = kzalloc(f->num_channels * sizeof(*f->channel), | 275 | f->channel = kzalloc(f->num_channels * sizeof(*f->channel), |