drm/nouveau/disp/nv50-: fetch mask of available piors during oneinit

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/g84.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/g84.c
index 287ac5edc88ab4263879a59e822bd9c83320cee3..1ec81f3e5d0a086fc2879152f1ad0dce1f57dcf1 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/g84.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/g84.c
@@ -35,7 +35,7 @@ g84_disp = {
        .head = { .cnt = nv50_head_cnt, .new = nv50_head_new },
        .dac = { .cnt = nv50_dac_cnt, .new = nv50_dac_new },
        .sor = { .cnt = nv50_sor_cnt, .new = g84_sor_new },
-       .pior = { .nr = 3, .new = nv50_pior_new },
+       .pior = { .cnt = nv50_pior_cnt, .new = nv50_pior_new },
 };
 
 int

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c
index e21f76d4e28e399bc68b380a7c78a1c372de5465..791c2cd157dcb36412d51870cc8228d98df1c1ac 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c
@@ -35,7 +35,7 @@ g94_disp = {
        .head = { .cnt = nv50_head_cnt, .new = nv50_head_new },
        .dac = { .cnt = nv50_dac_cnt, .new = nv50_dac_new },
        .sor = { .cnt = g94_sor_cnt, .new = g94_sor_new },
-       .pior = { .nr = 3, .new = nv50_pior_new },
+       .pior = { .cnt = nv50_pior_cnt, .new = nv50_pior_new },
 };
 
 int

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt200.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt200.c
index 2ca92a23a62a46f8ea6ba9c41081cae2a9d5d46e..62e721d5963a27351c7c649a2284a495afa9b4bf 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt200.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt200.c
@@ -35,7 +35,7 @@ gt200_disp = {
        .head = { .cnt = nv50_head_cnt, .new = nv50_head_new },
        .dac = { .cnt = nv50_dac_cnt, .new = nv50_dac_new },
        .sor = { .cnt = nv50_sor_cnt, .new = g84_sor_new },
-       .pior = { .nr = 3, .new = nv50_pior_new },
+       .pior = { .cnt = nv50_pior_cnt, .new = nv50_pior_new },
 };
 
 int

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c
index 73b039069660016151dac06134ccbb24454f589d..a5b1b1416740cb3e35131ba30ce6b64484fe5f44 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c
@@ -35,7 +35,7 @@ gt215_disp = {
        .head = { .cnt = nv50_head_cnt, .new = nv50_head_new },
        .dac = { .cnt = nv50_dac_cnt, .new = nv50_dac_new },
        .sor = { .cnt = g94_sor_cnt, .new = gt215_sor_new },
-       .pior = { .nr = 3, .new = nv50_pior_new },
+       .pior = { .cnt = nv50_pior_cnt, .new = nv50_pior_new },
 };
 
 int

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
index 6432e0611deece482dfea46a2e2e67a53cb5efad..9d43ab23f4d0f22925be92dca4b0151fc9582bc6 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
@@ -157,6 +157,7 @@ int nv50_dac_new(struct nvkm_disp *, int);
 int gf119_dac_cnt(struct nvkm_disp *, unsigned long *);
 int gf119_dac_new(struct nvkm_disp *, int);
 
+int nv50_pior_cnt(struct nvkm_disp *, unsigned long *);
 int nv50_pior_new(struct nvkm_disp *, int);
 
 int nv50_sor_cnt(struct nvkm_disp *, unsigned long *);

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c
index c3f6504ea67d25c142ac179260b36086142230a7..ff49040a581999663d017c2aec941dbca5389ef6 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c
@@ -33,7 +33,7 @@ mcp77_disp = {
        .head = { .cnt = nv50_head_cnt, .new = nv50_head_new },
        .dac = { .cnt = nv50_dac_cnt, .new = nv50_dac_new },
        .sor = { .cnt = g94_sor_cnt, .new = mcp77_sor_new },
-       .pior = { .nr = 3, .new = nv50_pior_new },
+       .pior = { .cnt = nv50_pior_cnt, .new = nv50_pior_new },
 };
 
 int

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp89.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp89.c
index 2d1d9218d25387c0b340b1bbe009ceacfab89ba3..0cf968d58fca77a706e59e883d9d23cc5b076c34 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp89.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp89.c
@@ -33,7 +33,7 @@ mcp89_disp = {
        .head = { .cnt = nv50_head_cnt, .new = nv50_head_new },
        .dac = { .cnt = nv50_dac_cnt, .new = nv50_dac_new },
        .sor = { .cnt = g94_sor_cnt, .new = mcp89_sor_new },
-       .pior = { .nr = 3, .new = nv50_pior_new },
+       .pior = { .cnt = nv50_pior_cnt, .new = nv50_pior_new },
 };
 
 int

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
index 1e32814488bf5e2d752cb6f1b2b59ef2f1f5ffec..c0faa3908a0060b03020d78c033e827d5f0a7897 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
@@ -87,10 +87,15 @@ nv50_disp_oneinit_(struct nvkm_disp *base)
                }
        }
 
-       for (i = 0; func->pior.new && i < func->pior.nr; i++) {
-               ret = func->pior.new(&disp->base, i);
-               if (ret)
-                       return ret;
+       if (func->pior.cnt) {
+               disp->pior.nr = func->pior.cnt(&disp->base, &disp->pior.mask);
+               nvkm_debug(subdev, "  PIOR(s): %d (%02lx)\n",
+                          disp->pior.nr, disp->pior.mask);
+               for_each_set_bit(i, &disp->pior.mask, disp->pior.nr) {
+                       ret = func->pior.new(&disp->base, i);
+                       if (ret)
+                               return ret;
+               }
        }
 
        disp->sor.nr = func->sor.cnt(&disp->base, &disp->sor.mask);
@@ -647,7 +652,7 @@ nv50_disp = {
        .head = { .cnt = nv50_head_cnt, .new = nv50_head_new },
        .dac = { .cnt = nv50_dac_cnt, .new = nv50_dac_new },
        .sor = { .cnt = nv50_sor_cnt, .new = nv50_sor_new },
-       .pior = { .nr = 3, .new = nv50_pior_new },
+       .pior = { .cnt = nv50_pior_cnt, .new = nv50_pior_new },
 };
 
 int

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
index ee2968b7aef16757c4fd6d733c3d0ae6ed15850e..a29bcf73ce6fc21e2138b5a5185a3ca2f37c346c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
@@ -27,6 +27,8 @@ struct nv50_disp {
        } sor;
 
        struct {
+               unsigned long mask;
+               int nr;
                u8 type[3];
        } pior;
 
@@ -55,12 +57,7 @@ struct nv50_disp_func {
        struct {
                int (*cnt)(struct nvkm_disp *, unsigned long *mask);
                int (*new)(struct nvkm_disp *, int id);
-       } head, dac, sor;
-
-       struct {
-               int nr;
-               int (*new)(struct nvkm_disp *, int id);
-       } pior;
+       } head, dac, sor, pior;
 };
 
 void nv50_disp_intr(struct nv50_disp *);

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/piornv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/piornv50.c
index 99b3b9050635a808cca2a1cea4ab405918eb6be3..e997a207f546513c2965ddfa53f79d26c6673209 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/piornv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/piornv50.c
@@ -127,8 +127,13 @@ nv50_pior = {
 int
 nv50_pior_new(struct nvkm_disp *disp, int id)
 {
-       struct nvkm_device *device = disp->engine.subdev.device;
-       if (!(nvkm_rd32(device, 0x610184) & (0x10000000 << id)))
-               return 0;
        return nvkm_ior_new_(&nv50_pior, disp, PIOR, id);
 }
+
+int
+nv50_pior_cnt(struct nvkm_disp *disp, unsigned long *pmask)
+{
+       struct nvkm_device *device = disp->engine.subdev.device;
+       *pmask = (nvkm_rd32(device, 0x610184) & 0x70000000) >> 28;
+       return 3;
+}

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c
index 9d0b5b71d38af3f689bb81405237f8bcea1bc804..c8379bf37a6da5828e0124e927616db350fb0433 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c
@@ -439,7 +439,7 @@ nv50_disp_root_init(struct nv50_disp_root *root)
        }
 
        /* ... PIOR caps */
-       for (i = 0; i < disp->func->pior.nr; i++) {
+       for (i = 0; i < disp->pior.nr; i++) {
                tmp = nvkm_rd32(device, 0x61e000 + (i * 0x800));
                nvkm_wr32(device, 0x6101f0 + (i * 0x04), tmp);
        }