diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2018-05-08 20:39:47 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2018-05-18 15:01:43 +1000 |
commit | 290ffeafcc1a953aa287c8a7bf7f6d9af25b7e77 (patch) | |
tree | f39ee09f4b066e630f8f4f453d1ced715822dce4 /drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c | |
parent | 6fb566b913728fe2dadc8271a568583b8854af93 (diff) |
drm/nouveau/disp/gv100: initial support
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c index 4a37c44fcbed..f89c7b977aa5 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c @@ -88,6 +88,12 @@ nv50_disp_oneinit_(struct nvkm_disp *base) struct nvkm_device *device = subdev->device; int ret, i; + if (func->wndw.cnt) { + disp->wndw.nr = func->wndw.cnt(&disp->base, &disp->wndw.mask); + nvkm_debug(subdev, "Window(s): %d (%08lx)\n", + disp->wndw.nr, disp->wndw.mask); + } + disp->head.nr = func->head.cnt(&disp->base, &disp->head.mask); nvkm_debug(subdev, " Head(s): %d (%02lx)\n", disp->head.nr, disp->head.mask); @@ -133,7 +139,8 @@ nv50_disp_oneinit_(struct nvkm_disp *base) if (ret) return ret; - return nvkm_ramht_new(device, 0x1000, 0, disp->inst, &disp->ramht); + return nvkm_ramht_new(device, func->ramht_size ? func->ramht_size : + 0x1000, 0, disp->inst, &disp->ramht); } static const struct nvkm_disp_func |