]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drm/nvd9-/disp: disable display underflow reporting at init
authorBen Skeggs <bskeggs@redhat.com>
Thu, 24 Oct 2013 23:59:14 +0000 (09:59 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Fri, 8 Nov 2013 05:39:53 +0000 (15:39 +1000)
Reported-by: Andy Ritger <aritger@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c

index 52dd7a1db729fdf086607cf703a210ec9aeba125..378a015091d2bf22d9a2ba5e49cd095b3ac774c7 100644 (file)
@@ -541,6 +541,15 @@ nvd0_disp_base_init(struct nouveau_object *object)
        nv_wr32(priv, 0x6100a0, 0x00000000);
        nv_wr32(priv, 0x6100b0, 0x00000307);
 
+       /* disable underflow reporting, preventing an intermittent issue
+        * on some nve4 boards where the production vbios left this
+        * setting enabled by default.
+        *
+        * ftp://download.nvidia.com/open-gpu-doc/gk104-disable-underflow-reporting/1/gk104-disable-underflow-reporting.txt
+        */
+       for (i = 0; i < priv->head.nr; i++)
+               nv_mask(priv, 0x616308 + (i * 0x800), 0x00000111, 0x00000010);
+
        return 0;
 }