From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 14 Aug 2012 02:50:14 +0000 (+1000)
Subject: drm/nv50/disp: enable interrupts and setup memory area
X-Git-Tag: v3.8-rc1~42^2~90
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=446b05a077fc880ccb135ed894285e4cf47e8c56;p=platform%2Fkernel%2Flinux-exynos.git

drm/nv50/disp: enable interrupts and setup memory area

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 87bfdb6..8d3b6a2 100644
--- a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
+++ b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
@@ -25,6 +25,8 @@
 #include <engine/software.h>
 #include <engine/disp.h>
 
+#include <subdev/timer.h>
+
 #include "nv50.h"
 
 /*******************************************************************************
@@ -295,18 +297,39 @@ nv50_disp_base_init(struct nouveau_object *object)
 		nv_wr32(priv, 0x6101f0 + (i * 0x04), tmp);
 	}
 
-	/* intr 100 */
-	/* 6194e8 shit */
-	/* intr */
-	/* set 610010 from engctx */
-	/* acquire mast? */
+	/* steal display away from vbios, or something like that */
+	if (nv_rd32(priv, 0x610024) & 0x00000100) {
+		nv_wr32(priv, 0x610024, 0x00000100);
+		nv_mask(priv, 0x6194e8, 0x00000001, 0x00000000);
+		if (!nv_wait(priv, 0x6194e8, 0x00000002, 0x00000000)) {
+			nv_error(priv, "timeout acquiring display\n");
+			return -EBUSY;
+		}
+	}
+
+	/* point at display engine memory area (hash table, objects) */
+	nv_wr32(priv, 0x610010, (nv_gpuobj(object->parent)->addr >> 8) | 9);
+
+	/* enable supervisor interrupts, disable everything else */
+	nv_wr32(priv, 0x610024, 0x00000370);
+	nv_wr32(priv, 0x610020, 0x00000000);
 	return 0;
 }
 
 static int
 nv50_disp_base_fini(struct nouveau_object *object, bool suspend)
 {
+	struct nv50_disp_priv *priv = (void *)object->engine;
 	struct nv50_disp_base *base = (void *)object;
+
+	/* disable all interrupts */
+	nv_wr32(priv, 0x610024, 0x00000000);
+	nv_wr32(priv, 0x610020, 0x00000000);
+
+	/* return control of display to vbios */
+	nv_mask(priv, 0x6194e8, 0x00000001, 0x00000001);
+	nv_wait(priv, 0x6194e8, 0x00000002, 0x00000002);
+
 	return nouveau_parent_fini(&base->base, suspend);
 }