This is a note to let you know that I've just added the patch titled
drm/nouveau/disp/nv04-nv40: abort scanoutpos query on vga analog.
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-nouveau-disp-nv04-nv40-abort-scanoutpos-query-on-vga-analog.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From e291af3f2259e9e105dfd72416fd5796513791a4 Mon Sep 17 00:00:00 2001
From: Mario Kleiner <mario.kleiner.de@xxxxxxxxx>
Date: Wed, 28 May 2014 05:22:18 +0200
Subject: drm/nouveau/disp/nv04-nv40: abort scanoutpos query on vga analog.
From: Mario Kleiner <mario.kleiner.de@xxxxxxxxx>
commit e291af3f2259e9e105dfd72416fd5796513791a4 upstream.
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@xxxxxxxxx>
Signed-off-by: Ben Skeggs <bskeggs@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/nouveau/core/engine/disp/nv04.c | 8 ++++++++
1 file changed, 8 insertions(+)
--- 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_obje
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());
Patches currently in stable-queue which might be from mario.kleiner.de@xxxxxxxxx are
queue-3.14/drm-nouveau-kms-reference-vblank-for-crtc-during-pageflip.patch
queue-3.14/drm-nouveau-disp-nv04-nv40-abort-scanoutpos-query-on-vga-analog.patch
queue-3.14/drm-nouveau-kms-nv04-nv40-fix-pageflip-events-via-special-case.patch
queue-3.14/drm-nv50-mc-fix-kms-pageflip-events-by-reordering-irq-handling-order.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html