leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/nouveau/bar/gf100: add config option to limit BAR2 to 16MiB

Browse Source 
Useful for testing, and for the userspace build where we can't kick
a framebuffer driver off the device.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2017-08-04 10:44:34 +10:00
parent 2659b4ce28
commit 485c2c91d4
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c
View File

@ -24,6 +24,7 @@
#include "gf100.h" #include "gf100.h"
#include <core/gpuobj.h> #include <core/gpuobj.h>
#include <core/option.h>
#include <subdev/fb.h> #include <subdev/fb.h>
#include <subdev/mmu.h> #include <subdev/mmu.h>
@ -59,6 +60,8 @@ gf100_bar_ctor_vm(struct gf100_bar *bar, struct gf100_bar_vm *bar_vm,
return ret; return ret;
bar_len = device->func->resource_size(device, bar_nr); bar_len = device->func->resource_size(device, bar_nr);
if (bar_nr == 3 && bar->bar2_halve)
bar_len >>= 1;
ret = nvkm_vm_new(device, 0, bar_len, 0, key, &vm); ret = nvkm_vm_new(device, 0, bar_len, 0, key, &vm);
if (ret) if (ret)
@ -129,6 +132,8 @@ gf100_bar_init(struct nvkm_bar *base)
if (bar->bar[0].mem) { if (bar->bar[0].mem) {
addr = nvkm_memory_addr(bar->bar[0].mem) >> 12; addr = nvkm_memory_addr(bar->bar[0].mem) >> 12;
if (bar->bar2_halve)
addr |= 0x40000000;
nvkm_wr32(device, 0x001714, 0x80000000 | addr); nvkm_wr32(device, 0x001714, 0x80000000 | addr);
} }
@ -161,6 +166,7 @@ gf100_bar_new_(const struct nvkm_bar_func *func, struct nvkm_device *device,
if (!(bar = kzalloc(sizeof(*bar), GFP_KERNEL))) if (!(bar = kzalloc(sizeof(*bar), GFP_KERNEL)))
return -ENOMEM; return -ENOMEM;
nvkm_bar_ctor(func, device, index, &bar->base); nvkm_bar_ctor(func, device, index, &bar->base);
bar->bar2_halve = nvkm_boolopt(device->cfgopt, "NvBar2Halve", false);
*pbar = &bar->base; *pbar = &bar->base;
return 0; return 0;
} }

1
drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.h
View File

@ -11,6 +11,7 @@ struct gf100_bar_vm {
struct gf100_bar { struct gf100_bar {
struct nvkm_bar base; struct nvkm_bar base;
bool bar2_halve;
struct gf100_bar_vm bar[2]; struct gf100_bar_vm bar[2];
}; };