From: Ben Skeggs <bskeggs@redhat.com>
Date: Fri, 8 Apr 2016 07:24:40 +0000 (+1000)
Subject: drm/nouveau/mc: allow for local definition of reset bits
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=70b01f07dbd093c96e9910ba613c3d40346ee222;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

drm/nouveau/mc: allow for local definition of reset bits

With the addition of PTOP-specified reset bits, it makes more sense to
move the definitions here rather than in individual subdev
implementations.

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 95183011510e..3793bc7889d5 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c
@@ -81,8 +81,21 @@ static void
 nvkm_mc_reset_(struct nvkm_mc *mc, enum nvkm_devidx devidx)
 {
 	struct nvkm_device *device = mc->subdev.device;
-	struct nvkm_subdev *subdev = nvkm_device_subdev(device, devidx);
-	u64 pmc_enable = subdev->pmc_enable;
+	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;
+		}
+	}
+
+	if (!pmc_enable) {
+		struct nvkm_subdev *subdev = nvkm_device_subdev(device, devidx);
+		pmc_enable = subdev->pmc_enable;
+	}
+
 	if (pmc_enable) {
 		nvkm_mask(device, 0x000200, pmc_enable, 0x00000000);
 		nvkm_mask(device, 0x000200, pmc_enable, pmc_enable);
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h
index fa2b2d610f1b..b80385b438b3 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h
@@ -20,6 +20,7 @@ struct nvkm_mc_func {
 	void (*intr_rearm)(struct nvkm_mc *);
 	/* retrieve pending interrupt mask (NV_PMC_INTR) */
 	u32 (*intr_mask)(struct nvkm_mc *);
+	const struct nvkm_mc_map *reset;
 	void (*unk260)(struct nvkm_mc *, u32);
 };