From: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Wed, 28 May 2014 03:22:18 +0000 (+0200)
Subject: drm/nouveau/disp/nv04-nv40: abort scanoutpos query on vga analog.
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~44^2~2^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e291af3f2259e9e105dfd72416fd5796513791a4;p=pandora-kernel.git

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+
---

Reading git-diff-tree failed