Attachment 95131 Details for Bug 70354 – probably "fix"

[patch] probably "fix"

0001-gr-gk104-therm-magic-needed-on-some-kepler-boards.patch (text/plain), 1.40 KB, created by Ben Skeggs on 2014-03-05 04:47:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Skeggs

Created: 2014-03-05 04:47:03 UTC

Size: 1.40 KB

patch

obsolete

>From a2cc4d7b81af26658a7eb47a70d54e6c002fca23 Mon Sep 17 00:00:00 2001
>From: Ben Skeggs <bskeggs@redhat.com>
>Date: Wed, 5 Mar 2014 14:46:48 +1000
>Subject: [PATCH] gr/gk104: therm magic needed on some kepler boards
>
>Not needed everywhere, and potentially not safe to do depending on how
>the rest of PTHERM is configured...
>
>Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
>---
> nvkm/engine/graph/nve4.c | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
>
>diff --git a/nvkm/engine/graph/nve4.c b/nvkm/engine/graph/nve4.c
>index 6e73b18..02371b1 100644
>--- a/nvkm/engine/graph/nve4.c
>+++ b/nvkm/engine/graph/nve4.c
>@@ -189,6 +189,17 @@ nve4_graph_pack_mmio[] = {
>  * PGRAPH engine/subdev functions
>  ******************************************************************************/
> 
>+static int
>+nve4_graph_fini(struct nouveau_object *object, bool suspend)
>+{
>+	struct nvc0_graph_priv *priv = (void *)object;
>+
>+	nv_mask(priv, 0x000200, 0x08001000, 0x00000000);
>+	nv_mask(priv, 0x020004, 0xc0000000, 0x40000000);
>+
>+	return nouveau_graph_fini(&priv->base, suspend);
>+}
>+
> int
> nve4_graph_init(struct nouveau_object *object)
> {
>@@ -327,7 +338,7 @@ nve4_graph_oclass = &(struct nvc0_graph_oclass) {
> 		.ctor = nvc0_graph_ctor,
> 		.dtor = nvc0_graph_dtor,
> 		.init = nve4_graph_init,
>-		.fini = _nouveau_graph_fini,
>+		.fini = nve4_graph_fini,
> 	},
> 	.cclass = &nve4_grctx_oclass,
> 	.sclass = nve4_graph_sclass,
>-- 
>1.9.0
>

Actions: View | Splinter Review

Attachments on bug 70354: 87411 | 87412 | 87530 | 87531 | 87532 | 87533 | 88738 | 90760 | 95131 | 96836 | 105421 | 106964 | 106965 | 112418 | 112419 | 112420 | 116849 | 116853

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.