drm/nouveau/disp/nv04-nv40: abort scanoutpos query on vga analog.

nv04_disp_scanoutpos() must abort to trigger simple timestamping
fallback if vtotal/htotal regs return zero. This happens if the
output isn't a digital output, but a vga analog output, as the
regs don't get initialized in that case.

Fixes timestamping failure on nv-40 and earlier with vga output.

Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Cc: <stable@vger.kernel.org> # 3.14+

diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nv04.c b/drivers/gpu/drm/nouveau/core/engine/disp/nv04.c
index 6c89af7928892e0a80a99ae5e8960996d81babae..94a2cc69ec2c75809f0dcb7386d7b470bc5c6b93 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/disp/nv04.c
+++ b/drivers/gpu/drm/nouveau/core/engine/disp/nv04.c
@@ -51,6 +51,14 @@ nv04_disp_scanoutpos(struct nouveau_object *object, u32 mthd,
        args->htotal  = nv_rd32(priv, 0x680824 + (head * 0x2000)) & 0xffff;
        args->hblanke = args->htotal - 1;
 
+       /*
+        * If output is vga instead of digital then vtotal/htotal is invalid
+        * so we have to give up and trigger the timestamping fallback in the
+        * drm core.
+        */
+       if (!args->vtotal || !args->htotal)
+               return -ENOTSUPP;
+
        args->time[0] = ktime_to_ns(ktime_get());
        line = nv_rd32(priv, 0x600868 + (head * 0x2000));
        args->time[1] = ktime_to_ns(ktime_get());