diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2018-05-08 20:39:46 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2018-05-18 15:01:20 +1000 |
| commit | bf5d1a6b6a4489b7887589fca6321d4024da71c8 (patch) | |
| tree | e04e6a40a6e077d33107ab9139e88c1ace32b1a1 /drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c | |
| parent | f7b2ece37fce822692d3d6e616e0d0f3df9d4f49 (diff) | |
| download | op-kernel-dev-bf5d1a6b6a4489b7887589fca6321d4024da71c8.zip op-kernel-dev-bf5d1a6b6a4489b7887589fca6321d4024da71c8.tar.gz | |
drm/nouveau/disp/nv50-: fetch mask of available dacs during oneinit
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 | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c index bf50b7b..500ef8d 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c @@ -76,10 +76,15 @@ nv50_disp_oneinit_(struct nvkm_disp *base) return ret; } - for (i = 0; func->dac.new && i < func->dac.nr; i++) { - ret = func->dac.new(&disp->base, i); - if (ret) - return ret; + if (func->dac.cnt) { + disp->dac.nr = func->dac.cnt(&disp->base, &disp->dac.mask); + nvkm_debug(subdev, " DAC(s): %d (%02lx)\n", + disp->dac.nr, disp->dac.mask); + for_each_set_bit(i, &disp->dac.mask, disp->dac.nr) { + ret = func->dac.new(&disp->base, i); + if (ret) + return ret; + } } for (i = 0; func->pior.new && i < func->pior.nr; i++) { @@ -637,7 +642,7 @@ nv50_disp = { .super = nv50_disp_super, .root = &nv50_disp_root_oclass, .head = { .cnt = nv50_head_cnt, .new = nv50_head_new }, - .dac = { .nr = 3, .new = nv50_dac_new }, + .dac = { .cnt = nv50_dac_cnt, .new = nv50_dac_new }, .sor = { .nr = 2, .new = nv50_sor_new }, .pior = { .nr = 3, .new = nv50_pior_new }, }; |
