Attachment 142783 Details for Bug 108980 – avoid touching falcon registers on fini

[patch] avoid touching falcon registers on fini

0001-drm-nouveau-falcon-avoid-touching-registers-if-engin.patch (text/plain), 1.22 KB, created by Ilia Mirkin on 2018-12-12 02:43:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ilia Mirkin

Created: 2018-12-12 02:43:08 UTC

Size: 1.22 KB

patch

obsolete

>From 6ca3028cd11fee31d967afe4fd521cecbdb7468a Mon Sep 17 00:00:00 2001
>From: Ilia Mirkin <imirkin@alum.mit.edu>
>Date: Tue, 11 Dec 2018 21:40:53 -0500
>Subject: [PATCH] drm/nouveau/falcon: avoid touching registers if engine is off
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108980
>Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
>---
> drivers/gpu/drm/nouveau/nvkm/engine/falcon.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c b/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c
>index 816ccaedfc73..8675613e142b 100644
>--- a/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c
>+++ b/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c
>@@ -22,6 +22,7 @@
> #include <engine/falcon.h>
> 
> #include <core/gpuobj.h>
>+#include <subdev/mc.h>
> #include <subdev/timer.h>
> #include <engine/fifo.h>
> 
>@@ -107,8 +108,10 @@ nvkm_falcon_fini(struct nvkm_engine *engine, bool suspend)
> 		}
> 	}
> 
>-	nvkm_mask(device, base + 0x048, 0x00000003, 0x00000000);
>-	nvkm_wr32(device, base + 0x014, 0xffffffff);
>+	if (nvkm_mc_enabled(device, engine->subdev.index)) {
>+		nvkm_mask(device, base + 0x048, 0x00000003, 0x00000000);
>+		nvkm_wr32(device, base + 0x014, 0xffffffff);
>+	}
> 	return 0;
> }
> 
>-- 
>2.18.1
>

Actions: View | Splinter Review

Attachments on bug 108980: 142760 | 142761 | 142783 | 142798

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.