From: Ben Skeggs <bskeggs@redhat.com>
Date: Fri, 8 Apr 2016 07:24:40 +0000 (+1000)
Subject: drm/nouveau/mc: implement support for PTOP reset info
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=583f8e4ea216d9d0212e63ede384893ec0c1b742;p=linux-beck.git

drm/nouveau/mc: implement support for PTOP reset info

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c
index 3793bc7889d5..134d44aba1e5 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c
@@ -24,6 +24,7 @@
 #include "priv.h"
 
 #include <core/option.h>
+#include <subdev/top.h>
 
 void
 nvkm_mc_unk260(struct nvkm_mc *mc, u32 data)
@@ -82,12 +83,14 @@ nvkm_mc_reset_(struct nvkm_mc *mc, enum nvkm_devidx devidx)
 {
 	struct nvkm_device *device = mc->subdev.device;
 	const struct nvkm_mc_map *map;
-	u64 pmc_enable = 0;
-
-	for (map = mc->func->reset; map && map->stat; map++) {
-		if (map->unit == devidx) {
-			pmc_enable = map->stat;
-			break;
+	u64 pmc_enable;
+
+	if (!(pmc_enable = nvkm_top_reset(device->top, devidx))) {
+		for (map = mc->func->reset; map && map->stat; map++) {
+			if (map->unit == devidx) {
+				pmc_enable = map->stat;
+				break;
+			}
 		}
 	}