drm/nv50-/disp: 0x0000 is a valid udisp config value

Return an out-of-range value instead to signal a failure from
exec_clkcmp().

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

diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
index 78f09c3dff1fe61dfeb3931e21527b7d68c4e579..c3806122d7713488375f818d960de73bb60333f7 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
+++ b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
@@ -863,8 +863,8 @@ exec_clkcmp(struct nv50_disp_priv *priv, int head, int id, u32 pclk,
        struct nvbios_outp info1;
        struct nvbios_ocfg info2;
        u8  ver, hdr, cnt, len;
-       u16 data, conf;
        u32 ctrl = 0x00000000;
+       u32 data, conf = ~0;
        int i;
 
        for (i = 0; !(ctrl & (1 << head)) && i < 3; i++)
@@ -885,12 +885,12 @@ exec_clkcmp(struct nv50_disp_priv *priv, int head, int id, u32 pclk,
        }
 
        if (!(ctrl & (1 << head)))
-               return 0x0000;
+               return conf;
        i--;
 
        data = exec_lookup(priv, head, i, ctrl, outp, &ver, &hdr, &cnt, &len, &info1);
        if (!data)
-               return 0x0000;
+               return conf;
 
        switch (outp->type) {
        case DCB_OUTPUT_TMDS:
@@ -923,13 +923,11 @@ exec_clkcmp(struct nv50_disp_priv *priv, int head, int id, u32 pclk,
                                .execute = 1,
                        };
 
-                       if (nvbios_exec(&init))
-                               return 0x0000;
-                       return conf;
+                       nvbios_exec(&init);
                }
        }
 
-       return 0x0000;
+       return conf;
 }
 
 static void
@@ -1082,7 +1080,7 @@ nv50_disp_intr_unk20(struct nv50_disp_priv *priv, u32 super)
        if (head >= 0) {
                u32 pclk = nv_rd32(priv, 0x610ad0 + (head * 0x540)) & 0x3fffff;
                u32 conf = exec_clkcmp(priv, head, 0, pclk, &outp);
-               if (conf) {
+               if (conf != ~0) {
                        if (outp.type == DCB_OUTPUT_ANALOG) {
                                addr = 0x614280 + (ffs(outp.or) - 1) * 0x800;
                                mask = 0xffffffff;
@@ -1132,7 +1130,7 @@ nv50_disp_intr_unk40(struct nv50_disp_priv *priv, u32 super)
        if (head >= 0) {
                struct dcb_output outp;
                u32 pclk = nv_rd32(priv, 0x610ad0 + (head * 0x540)) & 0x3fffff;
-               if (pclk && exec_clkcmp(priv, head, 1, pclk, &outp)) {
+               if (exec_clkcmp(priv, head, 1, pclk, &outp) != ~0) {
                        if (outp.type == DCB_OUTPUT_TMDS)
                                nv50_disp_intr_unk40_tmds(priv, &outp);
                }

diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c b/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
index 44618993661294409e21ff178d7caaab8616c97c..77cc730240720d095239f42cc893a5ab4bad4f05 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
@@ -657,11 +657,11 @@ exec_clkcmp(struct nv50_disp_priv *priv, int head, int outp,
        struct nvbios_ocfg info2;
        struct dcb_output dcb;
        u8  ver, hdr, cnt, len;
-       u16 data, conf;
+       u32 data, conf = ~0;
 
        data = exec_lookup(priv, head, outp, ctrl, &dcb, &ver, &hdr, &cnt, &len, &info1);
        if (data == 0x0000)
-               return false;
+               return conf;
 
        switch (dcb.type) {
        case DCB_OUTPUT_TMDS:
@@ -694,13 +694,11 @@ exec_clkcmp(struct nv50_disp_priv *priv, int head, int outp,
                                .execute = 1,
                        };
 
-                       if (nvbios_exec(&init))
-                               return 0x0000;
-                       return conf;
+                       nvbios_exec(&init);
                }
        }
 
-       return 0x0000;
+       return conf;
 }
 
 static void
@@ -785,9 +783,10 @@ nvd0_display_unk2_handler(struct nv50_disp_priv *priv, u32 head, u32 mask)
        nv_wr32(priv, 0x612200 + (head * 0x800), 0x00000000);
 
        for (i = 0; mask && i < 8; i++) {
-               u32 mcp = nv_rd32(priv, 0x660180 + (i * 0x20)), cfg;
+               u32 mcp = nv_rd32(priv, 0x660180 + (i * 0x20));
                if (mcp & (1 << head)) {
-                       if ((cfg = exec_clkcmp(priv, head, i, mcp, 0, pclk))) {
+                       u32 cfg = exec_clkcmp(priv, head, i, mcp, 0, pclk);
+                       if (cfg != ~0) {
                                u32 addr, mask, data = 0x00000000;
                                if (i < 4) {
                                        addr = 0x612280 + ((i - 0) * 0x800);