* [RFC v2 1/4] drm/nouveau: Add support for basic clockgating on Kepler1
2018-01-26 3:35 [RFC v2 0/4] Implement full clockgating for Kepler1 and 2 Lyude Paul
@ 2018-01-26 3:35 ` Lyude Paul
2018-01-26 11:34 ` [Nouveau] " Karol Herbst
2018-01-26 3:35 ` [RFC v2 2/4] drm/nouveau: Add support for BLCG " Lyude Paul
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Lyude Paul @ 2018-01-26 3:35 UTC (permalink / raw)
To: nouveau
Cc: Ben Skeggs, David Airlie, Rhys Kidd, Greg Kroah-Hartman,
Karol Herbst, Alexandre Courbot, Ilia Mirkin, Martin Peres,
linux-kernel, dri-devel
This adds support for enabling automatic clockgating on nvidia GPUs for
Kepler1. While this is not technically a clockgating level, it does
enable clockgating using the clockgating values initially set by the
vbios (which should be safe to use).
This introduces two therm helpers for controlling basic clockgating:
nvkm_therm_clkgate_enable() - enables clockgating through
CG_CTRL, done after initializing the GPU fully
nvkm_therm_clkgate_fini() - prepares clockgating for suspend or
driver unload
As well, we add the nouveau kernel config parameter NvPmEnableGating,
which can be toggled on or off in order to enable/disable clockgating.
Since we've only had limited testing on this thus far, we disable this
by default.
A lot of this code was originally going to be based off of fermi;
however it turns out that while Fermi's the first line of GPUs that
introduced this kind of power saving, Fermi requires more fine tuned
control of the CG_CTRL registers from the driver while reclocking that
we don't entirely understand yet.
For the simple parts we will be sharing with Fermi for certain however,
we at least add those into a new subdev/therm/gf100.h header.
Signed-off-by: Lyude Paul <lyude@redhat.com>
---
.../gpu/drm/nouveau/include/nvkm/subdev/therm.h | 5 +
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 17 +--
drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild | 1 +
drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c | 60 +++++++--
drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.h | 35 ++++++
drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf119.c | 8 +-
drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c | 135 +++++++++++++++++++++
drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.h | 48 ++++++++
drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h | 15 ++-
9 files changed, 303 insertions(+), 21 deletions(-)
create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.h
create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c
create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.h
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h
index b1ac47eb786e..240b19bb4667 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h
@@ -85,17 +85,22 @@ struct nvkm_therm {
int (*attr_get)(struct nvkm_therm *, enum nvkm_therm_attr_type);
int (*attr_set)(struct nvkm_therm *, enum nvkm_therm_attr_type, int);
+
+ bool clkgating_enabled;
};
int nvkm_therm_temp_get(struct nvkm_therm *);
int nvkm_therm_fan_sense(struct nvkm_therm *);
int nvkm_therm_cstate(struct nvkm_therm *, int, int);
+void nvkm_therm_clkgate_enable(struct nvkm_therm *);
+void nvkm_therm_clkgate_fini(struct nvkm_therm *, bool);
int nv40_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
int nv50_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
int g84_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
int gt215_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
int gf119_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
+int gk104_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
int gm107_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
int gm200_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
int gp100_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index 08e77cd55e6e..74bd09b1c893 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -28,6 +28,7 @@
#include <core/option.h>
#include <subdev/bios.h>
+#include <subdev/therm.h>
static DEFINE_MUTEX(nv_devices_mutex);
static LIST_HEAD(nv_devices);
@@ -1682,7 +1683,7 @@ nve4_chipset = {
.mxm = nv50_mxm_new,
.pci = gk104_pci_new,
.pmu = gk104_pmu_new,
- .therm = gf119_therm_new,
+ .therm = gk104_therm_new,
.timer = nv41_timer_new,
.top = gk104_top_new,
.volt = gk104_volt_new,
@@ -1721,7 +1722,7 @@ nve6_chipset = {
.mxm = nv50_mxm_new,
.pci = gk104_pci_new,
.pmu = gk104_pmu_new,
- .therm = gf119_therm_new,
+ .therm = gk104_therm_new,
.timer = nv41_timer_new,
.top = gk104_top_new,
.volt = gk104_volt_new,
@@ -1760,7 +1761,7 @@ nve7_chipset = {
.mxm = nv50_mxm_new,
.pci = gk104_pci_new,
.pmu = gk104_pmu_new,
- .therm = gf119_therm_new,
+ .therm = gk104_therm_new,
.timer = nv41_timer_new,
.top = gk104_top_new,
.volt = gk104_volt_new,
@@ -1824,7 +1825,7 @@ nvf0_chipset = {
.mxm = nv50_mxm_new,
.pci = gk104_pci_new,
.pmu = gk110_pmu_new,
- .therm = gf119_therm_new,
+ .therm = gk104_therm_new,
.timer = nv41_timer_new,
.top = gk104_top_new,
.volt = gk104_volt_new,
@@ -1862,7 +1863,7 @@ nvf1_chipset = {
.mxm = nv50_mxm_new,
.pci = gk104_pci_new,
.pmu = gk110_pmu_new,
- .therm = gf119_therm_new,
+ .therm = gk104_therm_new,
.timer = nv41_timer_new,
.top = gk104_top_new,
.volt = gk104_volt_new,
@@ -1900,7 +1901,7 @@ nv106_chipset = {
.mxm = nv50_mxm_new,
.pci = gk104_pci_new,
.pmu = gk208_pmu_new,
- .therm = gf119_therm_new,
+ .therm = gk104_therm_new,
.timer = nv41_timer_new,
.top = gk104_top_new,
.volt = gk104_volt_new,
@@ -1938,7 +1939,7 @@ nv108_chipset = {
.mxm = nv50_mxm_new,
.pci = gk104_pci_new,
.pmu = gk208_pmu_new,
- .therm = gf119_therm_new,
+ .therm = gk104_therm_new,
.timer = nv41_timer_new,
.top = gk104_top_new,
.volt = gk104_volt_new,
@@ -2508,6 +2509,7 @@ nvkm_device_fini(struct nvkm_device *device, bool suspend)
}
}
+ nvkm_therm_clkgate_fini(device->therm, suspend);
if (device->func->fini)
device->func->fini(device, suspend);
@@ -2597,6 +2599,7 @@ nvkm_device_init(struct nvkm_device *device)
}
nvkm_acpi_init(device);
+ nvkm_therm_clkgate_enable(device->therm);
time = ktime_to_us(ktime_get()) - time;
nvdev_trace(device, "init completed in %lldus\n", time);
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild
index 7ba56b12badd..4bac4772d8ed 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild
@@ -10,6 +10,7 @@ nvkm-y += nvkm/subdev/therm/nv50.o
nvkm-y += nvkm/subdev/therm/g84.o
nvkm-y += nvkm/subdev/therm/gt215.o
nvkm-y += nvkm/subdev/therm/gf119.o
+nvkm-y += nvkm/subdev/therm/gk104.o
nvkm-y += nvkm/subdev/therm/gm107.o
nvkm-y += nvkm/subdev/therm/gm200.o
nvkm-y += nvkm/subdev/therm/gp100.o
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
index f27fc6d0d4c6..e4c96e46db8f 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
@@ -21,6 +21,7 @@
*
* Authors: Martin Peres
*/
+#include <nvkm/core/option.h>
#include "priv.h"
int
@@ -297,6 +298,38 @@ nvkm_therm_attr_set(struct nvkm_therm *therm,
return -EINVAL;
}
+void
+nvkm_therm_clkgate_enable(struct nvkm_therm *therm)
+{
+ if (!therm->func->clkgate_enable || !therm->clkgating_enabled)
+ return;
+
+ nvkm_debug(&therm->subdev,
+ "Enabling clockgating\n");
+ therm->func->clkgate_enable(therm);
+}
+
+void
+nvkm_therm_clkgate_fini(struct nvkm_therm *therm, bool suspend)
+{
+ if (!therm->func->clkgate_fini || !therm->clkgating_enabled)
+ return;
+
+ nvkm_debug(&therm->subdev,
+ "Preparing clockgating for %s\n",
+ suspend ? "suspend" : "fini");
+ therm->func->clkgate_fini(therm, suspend);
+}
+
+static void
+nvkm_therm_clkgate_oneinit(struct nvkm_therm *therm)
+{
+ if (!therm->func->clkgate_enable || !therm->clkgating_enabled)
+ return;
+
+ nvkm_info(&therm->subdev, "Clockgating enabled\n");
+}
+
static void
nvkm_therm_intr(struct nvkm_subdev *subdev)
{
@@ -333,6 +366,7 @@ nvkm_therm_oneinit(struct nvkm_subdev *subdev)
nvkm_therm_fan_ctor(therm);
nvkm_therm_fan_mode(therm, NVKM_THERM_CTRL_AUTO);
nvkm_therm_sensor_preinit(therm);
+ nvkm_therm_clkgate_oneinit(therm);
return 0;
}
@@ -374,15 +408,10 @@ nvkm_therm = {
.intr = nvkm_therm_intr,
};
-int
-nvkm_therm_new_(const struct nvkm_therm_func *func, struct nvkm_device *device,
- int index, struct nvkm_therm **ptherm)
+void
+nvkm_therm_ctor(struct nvkm_therm *therm, struct nvkm_device *device,
+ int index, const struct nvkm_therm_func *func)
{
- struct nvkm_therm *therm;
-
- if (!(therm = *ptherm = kzalloc(sizeof(*therm), GFP_KERNEL)))
- return -ENOMEM;
-
nvkm_subdev_ctor(&nvkm_therm, device, index, &therm->subdev);
therm->func = func;
@@ -395,5 +424,20 @@ nvkm_therm_new_(const struct nvkm_therm_func *func, struct nvkm_device *device,
therm->attr_get = nvkm_therm_attr_get;
therm->attr_set = nvkm_therm_attr_set;
therm->mode = therm->suspend = -1; /* undefined */
+
+ therm->clkgating_enabled = nvkm_boolopt(device->cfgopt,
+ "NvPmEnableGating", false);
+}
+
+int
+nvkm_therm_new_(const struct nvkm_therm_func *func, struct nvkm_device *device,
+ int index, struct nvkm_therm **ptherm)
+{
+ struct nvkm_therm *therm;
+
+ if (!(therm = *ptherm = kzalloc(sizeof(*therm), GFP_KERNEL)))
+ return -ENOMEM;
+
+ nvkm_therm_ctor(therm, device, index, func);
return 0;
}
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.h b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.h
new file mode 100644
index 000000000000..cfb25af77c60
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2018 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Lyude Paul
+ */
+
+#ifndef __GF100_THERM_H__
+#define __GF100_THERM_H__
+
+#include <core/device.h>
+
+struct gf100_idle_filter {
+ u32 fecs;
+ u32 hubmmu;
+};
+
+#endif
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf119.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf119.c
index 06dcfd6ee966..0981b02790e2 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf119.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf119.c
@@ -49,7 +49,7 @@ pwm_info(struct nvkm_therm *therm, int line)
return -ENODEV;
}
-static int
+int
gf119_fan_pwm_ctrl(struct nvkm_therm *therm, int line, bool enable)
{
struct nvkm_device *device = therm->subdev.device;
@@ -63,7 +63,7 @@ gf119_fan_pwm_ctrl(struct nvkm_therm *therm, int line, bool enable)
return 0;
}
-static int
+int
gf119_fan_pwm_get(struct nvkm_therm *therm, int line, u32 *divs, u32 *duty)
{
struct nvkm_device *device = therm->subdev.device;
@@ -85,7 +85,7 @@ gf119_fan_pwm_get(struct nvkm_therm *therm, int line, u32 *divs, u32 *duty)
return -EINVAL;
}
-static int
+int
gf119_fan_pwm_set(struct nvkm_therm *therm, int line, u32 divs, u32 duty)
{
struct nvkm_device *device = therm->subdev.device;
@@ -102,7 +102,7 @@ gf119_fan_pwm_set(struct nvkm_therm *therm, int line, u32 divs, u32 duty)
return 0;
}
-static int
+int
gf119_fan_pwm_clock(struct nvkm_therm *therm, int line)
{
struct nvkm_device *device = therm->subdev.device;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c
new file mode 100644
index 000000000000..79806a757893
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2018 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Lyude Paul
+ */
+#include <core/device.h>
+
+#include "priv.h"
+#include "gk104.h"
+
+void
+gk104_clkgate_enable(struct nvkm_therm *base)
+{
+ struct gk104_therm *therm = gk104_therm(base);
+ struct nvkm_device *dev = therm->base.subdev.device;
+ const struct gk104_clkgate_engine_info *order = therm->clkgate_order;
+ int i;
+
+ /* Program ENG_MANT, ENG_FILTER */
+ for (i = 0; order[i].engine != NVKM_SUBDEV_NR; i++) {
+ if (!nvkm_device_subdev(dev, order[i].engine))
+ continue;
+
+ nvkm_mask(dev, 0x20200 + order[i].offset, 0xff00, 0x4500);
+ }
+
+ /* magic */
+ nvkm_wr32(dev, 0x020288, therm->idle_filter->fecs);
+ nvkm_wr32(dev, 0x02028c, therm->idle_filter->hubmmu);
+
+ /* Enable clockgating (ENG_CLK = RUN->AUTO) */
+ for (i = 0; order[i].engine != NVKM_SUBDEV_NR; i++) {
+ if (!nvkm_device_subdev(dev, order[i].engine))
+ continue;
+
+ nvkm_mask(dev, 0x20200 + order[i].offset, 0x00ff, 0x0045);
+ }
+}
+
+void
+gk104_clkgate_fini(struct nvkm_therm *base, bool suspend)
+{
+ struct gk104_therm *therm = gk104_therm(base);
+ struct nvkm_device *dev = therm->base.subdev.device;
+ const struct gk104_clkgate_engine_info *order = therm->clkgate_order;
+ int i;
+
+ /* ENG_CLK = AUTO->RUN, ENG_PWR = RUN->AUTO */
+ for (i = 0; order[i].engine != NVKM_SUBDEV_NR; i++) {
+ if (!nvkm_device_subdev(dev, order[i].engine))
+ continue;
+
+ nvkm_mask(dev, 0x20200 + order[i].offset, 0xff, 0x54);
+ }
+}
+
+const struct gk104_clkgate_engine_info gk104_clkgate_engine_info[] = {
+ { NVKM_ENGINE_GR, 0x00 },
+ { NVKM_ENGINE_MSPDEC, 0x04 },
+ { NVKM_ENGINE_MSPPP, 0x08 },
+ { NVKM_ENGINE_MSVLD, 0x0c },
+ { NVKM_ENGINE_CE0, 0x10 },
+ { NVKM_ENGINE_CE1, 0x14 },
+ { NVKM_ENGINE_MSENC, 0x18 },
+ { NVKM_ENGINE_CE2, 0x1c },
+ { NVKM_SUBDEV_NR, 0 },
+};
+
+const struct gf100_idle_filter gk104_idle_filter = {
+ .fecs = 0x00001000,
+ .hubmmu = 0x00001000,
+};
+
+static const struct nvkm_therm_func
+gk104_therm_func = {
+ .init = gf119_therm_init,
+ .fini = g84_therm_fini,
+ .pwm_ctrl = gf119_fan_pwm_ctrl,
+ .pwm_get = gf119_fan_pwm_get,
+ .pwm_set = gf119_fan_pwm_set,
+ .pwm_clock = gf119_fan_pwm_clock,
+ .temp_get = g84_temp_get,
+ .fan_sense = gt215_therm_fan_sense,
+ .program_alarms = nvkm_therm_program_alarms_polling,
+ .clkgate_enable = gk104_clkgate_enable,
+ .clkgate_fini = gk104_clkgate_fini,
+};
+
+static int
+gk104_therm_new_(const struct nvkm_therm_func *func,
+ struct nvkm_device *device,
+ int index,
+ const struct gk104_clkgate_engine_info *clkgate_order,
+ const struct gf100_idle_filter *idle_filter,
+ struct nvkm_therm **ptherm)
+{
+ struct gk104_therm *therm = kzalloc(sizeof(*therm), GFP_KERNEL);
+
+ if (!therm)
+ return -ENOMEM;
+
+ nvkm_therm_ctor(&therm->base, device, index, func);
+ *ptherm = &therm->base;
+ therm->clkgate_order = clkgate_order;
+ therm->idle_filter = idle_filter;
+
+ return 0;
+}
+
+int
+gk104_therm_new(struct nvkm_device *device,
+ int index, struct nvkm_therm **ptherm)
+{
+ return gk104_therm_new_(&gk104_therm_func, device, index,
+ gk104_clkgate_engine_info, &gk104_idle_filter,
+ ptherm);
+}
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.h b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.h
new file mode 100644
index 000000000000..293e7743b19b
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2018 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Lyude Paul
+ */
+
+#ifndef __GK104_THERM_H__
+#define __GK104_THERM_H__
+#define gk104_therm(p) (container_of((p), struct gk104_therm, base))
+
+#include <subdev/therm.h>
+#include "priv.h"
+#include "gf100.h"
+
+struct gk104_clkgate_engine_info {
+ enum nvkm_devidx engine;
+ u8 offset;
+};
+
+struct gk104_therm {
+ struct nvkm_therm base;
+
+ const struct gk104_clkgate_engine_info *clkgate_order;
+ const struct gf100_idle_filter *idle_filter;
+};
+
+extern const struct gk104_clkgate_engine_info gk104_clkgate_engine_info[];
+extern const struct gf100_idle_filter gk104_idle_filter;
+
+#endif
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h
index 1f46e371d7c4..f30202dd88e7 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h
@@ -32,6 +32,8 @@
int nvkm_therm_new_(const struct nvkm_therm_func *, struct nvkm_device *,
int index, struct nvkm_therm **);
+void nvkm_therm_ctor(struct nvkm_therm *therm, struct nvkm_device *device,
+ int index, const struct nvkm_therm_func *func);
struct nvkm_fan {
struct nvkm_therm *parent;
@@ -66,8 +68,6 @@ int nvkm_therm_fan_set(struct nvkm_therm *, bool now, int percent);
int nvkm_therm_fan_user_get(struct nvkm_therm *);
int nvkm_therm_fan_user_set(struct nvkm_therm *, int percent);
-int nvkm_therm_preinit(struct nvkm_therm *);
-
int nvkm_therm_sensor_init(struct nvkm_therm *);
int nvkm_therm_sensor_fini(struct nvkm_therm *, bool suspend);
void nvkm_therm_sensor_preinit(struct nvkm_therm *);
@@ -96,6 +96,9 @@ struct nvkm_therm_func {
int (*fan_sense)(struct nvkm_therm *);
void (*program_alarms)(struct nvkm_therm *);
+
+ void (*clkgate_enable)(struct nvkm_therm *);
+ void (*clkgate_fini)(struct nvkm_therm *, bool);
};
void nv40_therm_intr(struct nvkm_therm *);
@@ -112,8 +115,16 @@ void g84_therm_fini(struct nvkm_therm *);
int gt215_therm_fan_sense(struct nvkm_therm *);
void g84_therm_init(struct nvkm_therm *);
+
+int gf119_fan_pwm_ctrl(struct nvkm_therm *, int, bool);
+int gf119_fan_pwm_get(struct nvkm_therm *, int, u32 *, u32 *);
+int gf119_fan_pwm_set(struct nvkm_therm *, int, u32, u32);
+int gf119_fan_pwm_clock(struct nvkm_therm *, int);
void gf119_therm_init(struct nvkm_therm *);
+void gk104_clkgate_enable(struct nvkm_therm *);
+void gk104_clkgate_fini(struct nvkm_therm *, bool);
+
int nvkm_fanpwm_create(struct nvkm_therm *, struct dcb_gpio_func *);
int nvkm_fantog_create(struct nvkm_therm *, struct dcb_gpio_func *);
int nvkm_fannil_create(struct nvkm_therm *);
--
2.14.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [Nouveau] [RFC v2 1/4] drm/nouveau: Add support for basic clockgating on Kepler1
2018-01-26 3:35 ` [RFC v2 1/4] drm/nouveau: Add support for basic clockgating on Kepler1 Lyude Paul
@ 2018-01-26 11:34 ` Karol Herbst
2018-01-26 16:25 ` Lyude Paul
0 siblings, 1 reply; 9+ messages in thread
From: Karol Herbst @ 2018-01-26 11:34 UTC (permalink / raw)
To: Lyude Paul
Cc: nouveau, David Airlie, Greg Kroah-Hartman, dri-devel,
linux-kernel, Alexandre Courbot, Ben Skeggs
On Fri, Jan 26, 2018 at 4:35 AM, Lyude Paul <lyude@redhat.com> wrote:
> This adds support for enabling automatic clockgating on nvidia GPUs for
> Kepler1. While this is not technically a clockgating level, it does
> enable clockgating using the clockgating values initially set by the
> vbios (which should be safe to use).
>
> This introduces two therm helpers for controlling basic clockgating:
> nvkm_therm_clkgate_enable() - enables clockgating through
> CG_CTRL, done after initializing the GPU fully
> nvkm_therm_clkgate_fini() - prepares clockgating for suspend or
> driver unload
>
> As well, we add the nouveau kernel config parameter NvPmEnableGating,
> which can be toggled on or off in order to enable/disable clockgating.
> Since we've only had limited testing on this thus far, we disable this
> by default.
>
> A lot of this code was originally going to be based off of fermi;
> however it turns out that while Fermi's the first line of GPUs that
> introduced this kind of power saving, Fermi requires more fine tuned
> control of the CG_CTRL registers from the driver while reclocking that
> we don't entirely understand yet.
>
> For the simple parts we will be sharing with Fermi for certain however,
> we at least add those into a new subdev/therm/gf100.h header.
>
> Signed-off-by: Lyude Paul <lyude@redhat.com>
> ---
> .../gpu/drm/nouveau/include/nvkm/subdev/therm.h | 5 +
> drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 17 +--
> drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild | 1 +
> drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c | 60 +++++++--
> drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.h | 35 ++++++
> drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf119.c | 8 +-
> drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c | 135 +++++++++++++++++++++
> drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.h | 48 ++++++++
> drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h | 15 ++-
> 9 files changed, 303 insertions(+), 21 deletions(-)
> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.h
> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c
> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.h
>
> diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h
> index b1ac47eb786e..240b19bb4667 100644
> --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h
> +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h
> @@ -85,17 +85,22 @@ struct nvkm_therm {
>
> int (*attr_get)(struct nvkm_therm *, enum nvkm_therm_attr_type);
> int (*attr_set)(struct nvkm_therm *, enum nvkm_therm_attr_type, int);
> +
> + bool clkgating_enabled;
> };
>
> int nvkm_therm_temp_get(struct nvkm_therm *);
> int nvkm_therm_fan_sense(struct nvkm_therm *);
> int nvkm_therm_cstate(struct nvkm_therm *, int, int);
> +void nvkm_therm_clkgate_enable(struct nvkm_therm *);
> +void nvkm_therm_clkgate_fini(struct nvkm_therm *, bool);
>
> int nv40_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
> int nv50_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
> int g84_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
> int gt215_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
> int gf119_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
> +int gk104_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
> int gm107_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
> int gm200_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
> int gp100_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
> diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
> index 08e77cd55e6e..74bd09b1c893 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
> @@ -28,6 +28,7 @@
> #include <core/option.h>
>
> #include <subdev/bios.h>
> +#include <subdev/therm.h>
>
> static DEFINE_MUTEX(nv_devices_mutex);
> static LIST_HEAD(nv_devices);
> @@ -1682,7 +1683,7 @@ nve4_chipset = {
> .mxm = nv50_mxm_new,
> .pci = gk104_pci_new,
> .pmu = gk104_pmu_new,
> - .therm = gf119_therm_new,
> + .therm = gk104_therm_new,
> .timer = nv41_timer_new,
> .top = gk104_top_new,
> .volt = gk104_volt_new,
> @@ -1721,7 +1722,7 @@ nve6_chipset = {
> .mxm = nv50_mxm_new,
> .pci = gk104_pci_new,
> .pmu = gk104_pmu_new,
> - .therm = gf119_therm_new,
> + .therm = gk104_therm_new,
> .timer = nv41_timer_new,
> .top = gk104_top_new,
> .volt = gk104_volt_new,
> @@ -1760,7 +1761,7 @@ nve7_chipset = {
> .mxm = nv50_mxm_new,
> .pci = gk104_pci_new,
> .pmu = gk104_pmu_new,
> - .therm = gf119_therm_new,
> + .therm = gk104_therm_new,
> .timer = nv41_timer_new,
> .top = gk104_top_new,
> .volt = gk104_volt_new,
> @@ -1824,7 +1825,7 @@ nvf0_chipset = {
> .mxm = nv50_mxm_new,
> .pci = gk104_pci_new,
> .pmu = gk110_pmu_new,
> - .therm = gf119_therm_new,
> + .therm = gk104_therm_new,
> .timer = nv41_timer_new,
> .top = gk104_top_new,
> .volt = gk104_volt_new,
> @@ -1862,7 +1863,7 @@ nvf1_chipset = {
> .mxm = nv50_mxm_new,
> .pci = gk104_pci_new,
> .pmu = gk110_pmu_new,
> - .therm = gf119_therm_new,
> + .therm = gk104_therm_new,
> .timer = nv41_timer_new,
> .top = gk104_top_new,
> .volt = gk104_volt_new,
> @@ -1900,7 +1901,7 @@ nv106_chipset = {
> .mxm = nv50_mxm_new,
> .pci = gk104_pci_new,
> .pmu = gk208_pmu_new,
> - .therm = gf119_therm_new,
> + .therm = gk104_therm_new,
> .timer = nv41_timer_new,
> .top = gk104_top_new,
> .volt = gk104_volt_new,
> @@ -1938,7 +1939,7 @@ nv108_chipset = {
> .mxm = nv50_mxm_new,
> .pci = gk104_pci_new,
> .pmu = gk208_pmu_new,
> - .therm = gf119_therm_new,
> + .therm = gk104_therm_new,
> .timer = nv41_timer_new,
> .top = gk104_top_new,
> .volt = gk104_volt_new,
> @@ -2508,6 +2509,7 @@ nvkm_device_fini(struct nvkm_device *device, bool suspend)
> }
> }
>
> + nvkm_therm_clkgate_fini(device->therm, suspend);
>
> if (device->func->fini)
> device->func->fini(device, suspend);
> @@ -2597,6 +2599,7 @@ nvkm_device_init(struct nvkm_device *device)
> }
>
> nvkm_acpi_init(device);
> + nvkm_therm_clkgate_enable(device->therm);
>
> time = ktime_to_us(ktime_get()) - time;
> nvdev_trace(device, "init completed in %lldus\n", time);
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild
> index 7ba56b12badd..4bac4772d8ed 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild
> @@ -10,6 +10,7 @@ nvkm-y += nvkm/subdev/therm/nv50.o
> nvkm-y += nvkm/subdev/therm/g84.o
> nvkm-y += nvkm/subdev/therm/gt215.o
> nvkm-y += nvkm/subdev/therm/gf119.o
> +nvkm-y += nvkm/subdev/therm/gk104.o
> nvkm-y += nvkm/subdev/therm/gm107.o
> nvkm-y += nvkm/subdev/therm/gm200.o
> nvkm-y += nvkm/subdev/therm/gp100.o
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
> index f27fc6d0d4c6..e4c96e46db8f 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
> @@ -21,6 +21,7 @@
> *
> * Authors: Martin Peres
> */
> +#include <nvkm/core/option.h>
> #include "priv.h"
>
> int
> @@ -297,6 +298,38 @@ nvkm_therm_attr_set(struct nvkm_therm *therm,
> return -EINVAL;
> }
>
> +void
> +nvkm_therm_clkgate_enable(struct nvkm_therm *therm)
> +{
> + if (!therm->func->clkgate_enable || !therm->clkgating_enabled)
> + return;
> +
> + nvkm_debug(&therm->subdev,
> + "Enabling clockgating\n");
> + therm->func->clkgate_enable(therm);
> +}
> +
> +void
> +nvkm_therm_clkgate_fini(struct nvkm_therm *therm, bool suspend)
> +{
> + if (!therm->func->clkgate_fini || !therm->clkgating_enabled)
> + return;
> +
> + nvkm_debug(&therm->subdev,
> + "Preparing clockgating for %s\n",
> + suspend ? "suspend" : "fini");
> + therm->func->clkgate_fini(therm, suspend);
> +}
> +
> +static void
> +nvkm_therm_clkgate_oneinit(struct nvkm_therm *therm)
> +{
> + if (!therm->func->clkgate_enable || !therm->clkgating_enabled)
> + return;
> +
> + nvkm_info(&therm->subdev, "Clockgating enabled\n");
> +}
> +
> static void
> nvkm_therm_intr(struct nvkm_subdev *subdev)
> {
> @@ -333,6 +366,7 @@ nvkm_therm_oneinit(struct nvkm_subdev *subdev)
> nvkm_therm_fan_ctor(therm);
> nvkm_therm_fan_mode(therm, NVKM_THERM_CTRL_AUTO);
> nvkm_therm_sensor_preinit(therm);
> + nvkm_therm_clkgate_oneinit(therm);
> return 0;
> }
>
> @@ -374,15 +408,10 @@ nvkm_therm = {
> .intr = nvkm_therm_intr,
> };
>
> -int
> -nvkm_therm_new_(const struct nvkm_therm_func *func, struct nvkm_device *device,
> - int index, struct nvkm_therm **ptherm)
> +void
> +nvkm_therm_ctor(struct nvkm_therm *therm, struct nvkm_device *device,
> + int index, const struct nvkm_therm_func *func)
> {
> - struct nvkm_therm *therm;
> -
> - if (!(therm = *ptherm = kzalloc(sizeof(*therm), GFP_KERNEL)))
> - return -ENOMEM;
> -
> nvkm_subdev_ctor(&nvkm_therm, device, index, &therm->subdev);
> therm->func = func;
>
> @@ -395,5 +424,20 @@ nvkm_therm_new_(const struct nvkm_therm_func *func, struct nvkm_device *device,
> therm->attr_get = nvkm_therm_attr_get;
> therm->attr_set = nvkm_therm_attr_set;
> therm->mode = therm->suspend = -1; /* undefined */
> +
> + therm->clkgating_enabled = nvkm_boolopt(device->cfgopt,
> + "NvPmEnableGating", false);
> +}
> +
> +int
> +nvkm_therm_new_(const struct nvkm_therm_func *func, struct nvkm_device *device,
> + int index, struct nvkm_therm **ptherm)
> +{
> + struct nvkm_therm *therm;
> +
> + if (!(therm = *ptherm = kzalloc(sizeof(*therm), GFP_KERNEL)))
> + return -ENOMEM;
> +
> + nvkm_therm_ctor(therm, device, index, func);
> return 0;
> }
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.h b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.h
> new file mode 100644
> index 000000000000..cfb25af77c60
> --- /dev/null
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.h
> @@ -0,0 +1,35 @@
> +/*
> + * Copyright 2018 Red Hat Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + *
> + * Authors: Lyude Paul
> + */
> +
> +#ifndef __GF100_THERM_H__
> +#define __GF100_THERM_H__
> +
> +#include <core/device.h>
> +
> +struct gf100_idle_filter {
> + u32 fecs;
> + u32 hubmmu;
> +};
> +
> +#endif
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf119.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf119.c
> index 06dcfd6ee966..0981b02790e2 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf119.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf119.c
> @@ -49,7 +49,7 @@ pwm_info(struct nvkm_therm *therm, int line)
> return -ENODEV;
> }
>
> -static int
> +int
> gf119_fan_pwm_ctrl(struct nvkm_therm *therm, int line, bool enable)
> {
> struct nvkm_device *device = therm->subdev.device;
> @@ -63,7 +63,7 @@ gf119_fan_pwm_ctrl(struct nvkm_therm *therm, int line, bool enable)
> return 0;
> }
>
> -static int
> +int
> gf119_fan_pwm_get(struct nvkm_therm *therm, int line, u32 *divs, u32 *duty)
> {
> struct nvkm_device *device = therm->subdev.device;
> @@ -85,7 +85,7 @@ gf119_fan_pwm_get(struct nvkm_therm *therm, int line, u32 *divs, u32 *duty)
> return -EINVAL;
> }
>
> -static int
> +int
> gf119_fan_pwm_set(struct nvkm_therm *therm, int line, u32 divs, u32 duty)
> {
> struct nvkm_device *device = therm->subdev.device;
> @@ -102,7 +102,7 @@ gf119_fan_pwm_set(struct nvkm_therm *therm, int line, u32 divs, u32 duty)
> return 0;
> }
>
> -static int
> +int
> gf119_fan_pwm_clock(struct nvkm_therm *therm, int line)
> {
> struct nvkm_device *device = therm->subdev.device;
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c
> new file mode 100644
> index 000000000000..79806a757893
> --- /dev/null
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c
> @@ -0,0 +1,135 @@
> +/*
> + * Copyright 2018 Red Hat Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + *
> + * Authors: Lyude Paul
> + */
> +#include <core/device.h>
> +
> +#include "priv.h"
> +#include "gk104.h"
> +
> +void
> +gk104_clkgate_enable(struct nvkm_therm *base)
> +{
> + struct gk104_therm *therm = gk104_therm(base);
> + struct nvkm_device *dev = therm->base.subdev.device;
> + const struct gk104_clkgate_engine_info *order = therm->clkgate_order;
> + int i;
> +
> + /* Program ENG_MANT, ENG_FILTER */
> + for (i = 0; order[i].engine != NVKM_SUBDEV_NR; i++) {
> + if (!nvkm_device_subdev(dev, order[i].engine))
> + continue;
> +
> + nvkm_mask(dev, 0x20200 + order[i].offset, 0xff00, 0x4500);
> + }
> +
> + /* magic */
> + nvkm_wr32(dev, 0x020288, therm->idle_filter->fecs);
> + nvkm_wr32(dev, 0x02028c, therm->idle_filter->hubmmu);
> +
> + /* Enable clockgating (ENG_CLK = RUN->AUTO) */
> + for (i = 0; order[i].engine != NVKM_SUBDEV_NR; i++) {
> + if (!nvkm_device_subdev(dev, order[i].engine))
> + continue;
> +
> + nvkm_mask(dev, 0x20200 + order[i].offset, 0x00ff, 0x0045);
> + }
> +}
> +
> +void
> +gk104_clkgate_fini(struct nvkm_therm *base, bool suspend)
> +{
> + struct gk104_therm *therm = gk104_therm(base);
> + struct nvkm_device *dev = therm->base.subdev.device;
> + const struct gk104_clkgate_engine_info *order = therm->clkgate_order;
> + int i;
> +
> + /* ENG_CLK = AUTO->RUN, ENG_PWR = RUN->AUTO */
> + for (i = 0; order[i].engine != NVKM_SUBDEV_NR; i++) {
> + if (!nvkm_device_subdev(dev, order[i].engine))
> + continue;
> +
> + nvkm_mask(dev, 0x20200 + order[i].offset, 0xff, 0x54);
> + }
shouldn't that be 0x44? Or does nvidia actually set it to that value?
That would be a little odd, because it sets the mode for ENG_PWR from
ON to AUTO and I am sure GPUs boot usually with 0x44.
> +}
> +
> +const struct gk104_clkgate_engine_info gk104_clkgate_engine_info[] = {
> + { NVKM_ENGINE_GR, 0x00 },
> + { NVKM_ENGINE_MSPDEC, 0x04 },
> + { NVKM_ENGINE_MSPPP, 0x08 },
> + { NVKM_ENGINE_MSVLD, 0x0c },
> + { NVKM_ENGINE_CE0, 0x10 },
> + { NVKM_ENGINE_CE1, 0x14 },
> + { NVKM_ENGINE_MSENC, 0x18 },
> + { NVKM_ENGINE_CE2, 0x1c },
> + { NVKM_SUBDEV_NR, 0 },
> +};
> +
> +const struct gf100_idle_filter gk104_idle_filter = {
> + .fecs = 0x00001000,
> + .hubmmu = 0x00001000,
> +};
> +
> +static const struct nvkm_therm_func
> +gk104_therm_func = {
> + .init = gf119_therm_init,
> + .fini = g84_therm_fini,
> + .pwm_ctrl = gf119_fan_pwm_ctrl,
> + .pwm_get = gf119_fan_pwm_get,
> + .pwm_set = gf119_fan_pwm_set,
> + .pwm_clock = gf119_fan_pwm_clock,
> + .temp_get = g84_temp_get,
> + .fan_sense = gt215_therm_fan_sense,
> + .program_alarms = nvkm_therm_program_alarms_polling,
> + .clkgate_enable = gk104_clkgate_enable,
> + .clkgate_fini = gk104_clkgate_fini,
> +};
> +
> +static int
> +gk104_therm_new_(const struct nvkm_therm_func *func,
> + struct nvkm_device *device,
> + int index,
> + const struct gk104_clkgate_engine_info *clkgate_order,
> + const struct gf100_idle_filter *idle_filter,
> + struct nvkm_therm **ptherm)
> +{
> + struct gk104_therm *therm = kzalloc(sizeof(*therm), GFP_KERNEL);
> +
> + if (!therm)
> + return -ENOMEM;
> +
> + nvkm_therm_ctor(&therm->base, device, index, func);
> + *ptherm = &therm->base;
> + therm->clkgate_order = clkgate_order;
> + therm->idle_filter = idle_filter;
> +
> + return 0;
> +}
> +
> +int
> +gk104_therm_new(struct nvkm_device *device,
> + int index, struct nvkm_therm **ptherm)
> +{
> + return gk104_therm_new_(&gk104_therm_func, device, index,
> + gk104_clkgate_engine_info, &gk104_idle_filter,
> + ptherm);
> +}
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.h b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.h
> new file mode 100644
> index 000000000000..293e7743b19b
> --- /dev/null
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.h
> @@ -0,0 +1,48 @@
> +/*
> + * Copyright 2018 Red Hat Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + *
> + * Authors: Lyude Paul
> + */
> +
> +#ifndef __GK104_THERM_H__
> +#define __GK104_THERM_H__
> +#define gk104_therm(p) (container_of((p), struct gk104_therm, base))
> +
> +#include <subdev/therm.h>
> +#include "priv.h"
> +#include "gf100.h"
> +
> +struct gk104_clkgate_engine_info {
> + enum nvkm_devidx engine;
> + u8 offset;
> +};
> +
> +struct gk104_therm {
> + struct nvkm_therm base;
> +
> + const struct gk104_clkgate_engine_info *clkgate_order;
> + const struct gf100_idle_filter *idle_filter;
> +};
> +
> +extern const struct gk104_clkgate_engine_info gk104_clkgate_engine_info[];
> +extern const struct gf100_idle_filter gk104_idle_filter;
> +
> +#endif
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h
> index 1f46e371d7c4..f30202dd88e7 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h
> @@ -32,6 +32,8 @@
>
> int nvkm_therm_new_(const struct nvkm_therm_func *, struct nvkm_device *,
> int index, struct nvkm_therm **);
> +void nvkm_therm_ctor(struct nvkm_therm *therm, struct nvkm_device *device,
> + int index, const struct nvkm_therm_func *func);
>
> struct nvkm_fan {
> struct nvkm_therm *parent;
> @@ -66,8 +68,6 @@ int nvkm_therm_fan_set(struct nvkm_therm *, bool now, int percent);
> int nvkm_therm_fan_user_get(struct nvkm_therm *);
> int nvkm_therm_fan_user_set(struct nvkm_therm *, int percent);
>
> -int nvkm_therm_preinit(struct nvkm_therm *);
> -
> int nvkm_therm_sensor_init(struct nvkm_therm *);
> int nvkm_therm_sensor_fini(struct nvkm_therm *, bool suspend);
> void nvkm_therm_sensor_preinit(struct nvkm_therm *);
> @@ -96,6 +96,9 @@ struct nvkm_therm_func {
> int (*fan_sense)(struct nvkm_therm *);
>
> void (*program_alarms)(struct nvkm_therm *);
> +
> + void (*clkgate_enable)(struct nvkm_therm *);
> + void (*clkgate_fini)(struct nvkm_therm *, bool);
> };
>
> void nv40_therm_intr(struct nvkm_therm *);
> @@ -112,8 +115,16 @@ void g84_therm_fini(struct nvkm_therm *);
> int gt215_therm_fan_sense(struct nvkm_therm *);
>
> void g84_therm_init(struct nvkm_therm *);
> +
> +int gf119_fan_pwm_ctrl(struct nvkm_therm *, int, bool);
> +int gf119_fan_pwm_get(struct nvkm_therm *, int, u32 *, u32 *);
> +int gf119_fan_pwm_set(struct nvkm_therm *, int, u32, u32);
> +int gf119_fan_pwm_clock(struct nvkm_therm *, int);
> void gf119_therm_init(struct nvkm_therm *);
>
> +void gk104_clkgate_enable(struct nvkm_therm *);
> +void gk104_clkgate_fini(struct nvkm_therm *, bool);
> +
> int nvkm_fanpwm_create(struct nvkm_therm *, struct dcb_gpio_func *);
> int nvkm_fantog_create(struct nvkm_therm *, struct dcb_gpio_func *);
> int nvkm_fannil_create(struct nvkm_therm *);
> --
> 2.14.3
>
> _______________________________________________
> Nouveau mailing list
> Nouveau@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/nouveau
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Nouveau] [RFC v2 1/4] drm/nouveau: Add support for basic clockgating on Kepler1
2018-01-26 11:34 ` [Nouveau] " Karol Herbst
@ 2018-01-26 16:25 ` Lyude Paul
0 siblings, 0 replies; 9+ messages in thread
From: Lyude Paul @ 2018-01-26 16:25 UTC (permalink / raw)
To: Karol Herbst
Cc: nouveau, David Airlie, Greg Kroah-Hartman, dri-devel,
linux-kernel, Alexandre Courbot, Ben Skeggs
On Fri, 2018-01-26 at 12:34 +0100, Karol Herbst wrote:
> On Fri, Jan 26, 2018 at 4:35 AM, Lyude Paul <lyude@redhat.com> wrote:
> > This adds support for enabling automatic clockgating on nvidia GPUs for
> > Kepler1. While this is not technically a clockgating level, it does
> > enable clockgating using the clockgating values initially set by the
> > vbios (which should be safe to use).
> >
> > This introduces two therm helpers for controlling basic clockgating:
> > nvkm_therm_clkgate_enable() - enables clockgating through
> > CG_CTRL, done after initializing the GPU fully
> > nvkm_therm_clkgate_fini() - prepares clockgating for suspend or
> > driver unload
> >
> > As well, we add the nouveau kernel config parameter NvPmEnableGating,
> > which can be toggled on or off in order to enable/disable clockgating.
> > Since we've only had limited testing on this thus far, we disable this
> > by default.
> >
> > A lot of this code was originally going to be based off of fermi;
> > however it turns out that while Fermi's the first line of GPUs that
> > introduced this kind of power saving, Fermi requires more fine tuned
> > control of the CG_CTRL registers from the driver while reclocking that
> > we don't entirely understand yet.
> >
> > For the simple parts we will be sharing with Fermi for certain however,
> > we at least add those into a new subdev/therm/gf100.h header.
> >
> > Signed-off-by: Lyude Paul <lyude@redhat.com>
> > ---
> > .../gpu/drm/nouveau/include/nvkm/subdev/therm.h | 5 +
> > drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 17 +--
> > drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild | 1 +
> > drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c | 60 +++++++--
> > drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.h | 35 ++++++
> > drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf119.c | 8 +-
> > drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c | 135
> > +++++++++++++++++++++
> > drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.h | 48 ++++++++
> > drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h | 15 ++-
> > 9 files changed, 303 insertions(+), 21 deletions(-)
> > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.h
> > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c
> > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.h
> >
> > diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h
> > b/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h
> > index b1ac47eb786e..240b19bb4667 100644
> > --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h
> > +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h
> > @@ -85,17 +85,22 @@ struct nvkm_therm {
> >
> > int (*attr_get)(struct nvkm_therm *, enum nvkm_therm_attr_type);
> > int (*attr_set)(struct nvkm_therm *, enum nvkm_therm_attr_type,
> > int);
> > +
> > + bool clkgating_enabled;
> > };
> >
> > int nvkm_therm_temp_get(struct nvkm_therm *);
> > int nvkm_therm_fan_sense(struct nvkm_therm *);
> > int nvkm_therm_cstate(struct nvkm_therm *, int, int);
> > +void nvkm_therm_clkgate_enable(struct nvkm_therm *);
> > +void nvkm_therm_clkgate_fini(struct nvkm_therm *, bool);
> >
> > int nv40_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
> > int nv50_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
> > int g84_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
> > int gt215_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
> > int gf119_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
> > +int gk104_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
> > int gm107_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
> > int gm200_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
> > int gp100_therm_new(struct nvkm_device *, int, struct nvkm_therm **);
> > diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
> > b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
> > index 08e77cd55e6e..74bd09b1c893 100644
> > --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
> > +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
> > @@ -28,6 +28,7 @@
> > #include <core/option.h>
> >
> > #include <subdev/bios.h>
> > +#include <subdev/therm.h>
> >
> > static DEFINE_MUTEX(nv_devices_mutex);
> > static LIST_HEAD(nv_devices);
> > @@ -1682,7 +1683,7 @@ nve4_chipset = {
> > .mxm = nv50_mxm_new,
> > .pci = gk104_pci_new,
> > .pmu = gk104_pmu_new,
> > - .therm = gf119_therm_new,
> > + .therm = gk104_therm_new,
> > .timer = nv41_timer_new,
> > .top = gk104_top_new,
> > .volt = gk104_volt_new,
> > @@ -1721,7 +1722,7 @@ nve6_chipset = {
> > .mxm = nv50_mxm_new,
> > .pci = gk104_pci_new,
> > .pmu = gk104_pmu_new,
> > - .therm = gf119_therm_new,
> > + .therm = gk104_therm_new,
> > .timer = nv41_timer_new,
> > .top = gk104_top_new,
> > .volt = gk104_volt_new,
> > @@ -1760,7 +1761,7 @@ nve7_chipset = {
> > .mxm = nv50_mxm_new,
> > .pci = gk104_pci_new,
> > .pmu = gk104_pmu_new,
> > - .therm = gf119_therm_new,
> > + .therm = gk104_therm_new,
> > .timer = nv41_timer_new,
> > .top = gk104_top_new,
> > .volt = gk104_volt_new,
> > @@ -1824,7 +1825,7 @@ nvf0_chipset = {
> > .mxm = nv50_mxm_new,
> > .pci = gk104_pci_new,
> > .pmu = gk110_pmu_new,
> > - .therm = gf119_therm_new,
> > + .therm = gk104_therm_new,
> > .timer = nv41_timer_new,
> > .top = gk104_top_new,
> > .volt = gk104_volt_new,
> > @@ -1862,7 +1863,7 @@ nvf1_chipset = {
> > .mxm = nv50_mxm_new,
> > .pci = gk104_pci_new,
> > .pmu = gk110_pmu_new,
> > - .therm = gf119_therm_new,
> > + .therm = gk104_therm_new,
> > .timer = nv41_timer_new,
> > .top = gk104_top_new,
> > .volt = gk104_volt_new,
> > @@ -1900,7 +1901,7 @@ nv106_chipset = {
> > .mxm = nv50_mxm_new,
> > .pci = gk104_pci_new,
> > .pmu = gk208_pmu_new,
> > - .therm = gf119_therm_new,
> > + .therm = gk104_therm_new,
> > .timer = nv41_timer_new,
> > .top = gk104_top_new,
> > .volt = gk104_volt_new,
> > @@ -1938,7 +1939,7 @@ nv108_chipset = {
> > .mxm = nv50_mxm_new,
> > .pci = gk104_pci_new,
> > .pmu = gk208_pmu_new,
> > - .therm = gf119_therm_new,
> > + .therm = gk104_therm_new,
> > .timer = nv41_timer_new,
> > .top = gk104_top_new,
> > .volt = gk104_volt_new,
> > @@ -2508,6 +2509,7 @@ nvkm_device_fini(struct nvkm_device *device, bool
> > suspend)
> > }
> > }
> >
> > + nvkm_therm_clkgate_fini(device->therm, suspend);
> >
> > if (device->func->fini)
> > device->func->fini(device, suspend);
> > @@ -2597,6 +2599,7 @@ nvkm_device_init(struct nvkm_device *device)
> > }
> >
> > nvkm_acpi_init(device);
> > + nvkm_therm_clkgate_enable(device->therm);
> >
> > time = ktime_to_us(ktime_get()) - time;
> > nvdev_trace(device, "init completed in %lldus\n", time);
> > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild
> > b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild
> > index 7ba56b12badd..4bac4772d8ed 100644
> > --- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild
> > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild
> > @@ -10,6 +10,7 @@ nvkm-y += nvkm/subdev/therm/nv50.o
> > nvkm-y += nvkm/subdev/therm/g84.o
> > nvkm-y += nvkm/subdev/therm/gt215.o
> > nvkm-y += nvkm/subdev/therm/gf119.o
> > +nvkm-y += nvkm/subdev/therm/gk104.o
> > nvkm-y += nvkm/subdev/therm/gm107.o
> > nvkm-y += nvkm/subdev/therm/gm200.o
> > nvkm-y += nvkm/subdev/therm/gp100.o
> > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
> > b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
> > index f27fc6d0d4c6..e4c96e46db8f 100644
> > --- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
> > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
> > @@ -21,6 +21,7 @@
> > *
> > * Authors: Martin Peres
> > */
> > +#include <nvkm/core/option.h>
> > #include "priv.h"
> >
> > int
> > @@ -297,6 +298,38 @@ nvkm_therm_attr_set(struct nvkm_therm *therm,
> > return -EINVAL;
> > }
> >
> > +void
> > +nvkm_therm_clkgate_enable(struct nvkm_therm *therm)
> > +{
> > + if (!therm->func->clkgate_enable || !therm->clkgating_enabled)
> > + return;
> > +
> > + nvkm_debug(&therm->subdev,
> > + "Enabling clockgating\n");
> > + therm->func->clkgate_enable(therm);
> > +}
> > +
> > +void
> > +nvkm_therm_clkgate_fini(struct nvkm_therm *therm, bool suspend)
> > +{
> > + if (!therm->func->clkgate_fini || !therm->clkgating_enabled)
> > + return;
> > +
> > + nvkm_debug(&therm->subdev,
> > + "Preparing clockgating for %s\n",
> > + suspend ? "suspend" : "fini");
> > + therm->func->clkgate_fini(therm, suspend);
> > +}
> > +
> > +static void
> > +nvkm_therm_clkgate_oneinit(struct nvkm_therm *therm)
> > +{
> > + if (!therm->func->clkgate_enable || !therm->clkgating_enabled)
> > + return;
> > +
> > + nvkm_info(&therm->subdev, "Clockgating enabled\n");
> > +}
> > +
> > static void
> > nvkm_therm_intr(struct nvkm_subdev *subdev)
> > {
> > @@ -333,6 +366,7 @@ nvkm_therm_oneinit(struct nvkm_subdev *subdev)
> > nvkm_therm_fan_ctor(therm);
> > nvkm_therm_fan_mode(therm, NVKM_THERM_CTRL_AUTO);
> > nvkm_therm_sensor_preinit(therm);
> > + nvkm_therm_clkgate_oneinit(therm);
> > return 0;
> > }
> >
> > @@ -374,15 +408,10 @@ nvkm_therm = {
> > .intr = nvkm_therm_intr,
> > };
> >
> > -int
> > -nvkm_therm_new_(const struct nvkm_therm_func *func, struct nvkm_device
> > *device,
> > - int index, struct nvkm_therm **ptherm)
> > +void
> > +nvkm_therm_ctor(struct nvkm_therm *therm, struct nvkm_device *device,
> > + int index, const struct nvkm_therm_func *func)
> > {
> > - struct nvkm_therm *therm;
> > -
> > - if (!(therm = *ptherm = kzalloc(sizeof(*therm), GFP_KERNEL)))
> > - return -ENOMEM;
> > -
> > nvkm_subdev_ctor(&nvkm_therm, device, index, &therm->subdev);
> > therm->func = func;
> >
> > @@ -395,5 +424,20 @@ nvkm_therm_new_(const struct nvkm_therm_func *func,
> > struct nvkm_device *device,
> > therm->attr_get = nvkm_therm_attr_get;
> > therm->attr_set = nvkm_therm_attr_set;
> > therm->mode = therm->suspend = -1; /* undefined */
> > +
> > + therm->clkgating_enabled = nvkm_boolopt(device->cfgopt,
> > + "NvPmEnableGating", false);
> > +}
> > +
> > +int
> > +nvkm_therm_new_(const struct nvkm_therm_func *func, struct nvkm_device
> > *device,
> > + int index, struct nvkm_therm **ptherm)
> > +{
> > + struct nvkm_therm *therm;
> > +
> > + if (!(therm = *ptherm = kzalloc(sizeof(*therm), GFP_KERNEL)))
> > + return -ENOMEM;
> > +
> > + nvkm_therm_ctor(therm, device, index, func);
> > return 0;
> > }
> > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.h
> > b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.h
> > new file mode 100644
> > index 000000000000..cfb25af77c60
> > --- /dev/null
> > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.h
> > @@ -0,0 +1,35 @@
> > +/*
> > + * Copyright 2018 Red Hat Inc.
> > + *
> > + * Permission is hereby granted, free of charge, to any person obtaining a
> > + * copy of this software and associated documentation files (the
> > "Software"),
> > + * to deal in the Software without restriction, including without
> > limitation
> > + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> > + * and/or sell copies of the Software, and to permit persons to whom the
> > + * Software is furnished to do so, subject to the following conditions:
> > + *
> > + * The above copyright notice and this permission notice shall be included
> > in
> > + * all copies or substantial portions of the Software.
> > + *
> > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
> > OR
> > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> > + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
> > + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> > + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> > + * OTHER DEALINGS IN THE SOFTWARE.
> > + *
> > + * Authors: Lyude Paul
> > + */
> > +
> > +#ifndef __GF100_THERM_H__
> > +#define __GF100_THERM_H__
> > +
> > +#include <core/device.h>
> > +
> > +struct gf100_idle_filter {
> > + u32 fecs;
> > + u32 hubmmu;
> > +};
> > +
> > +#endif
> > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf119.c
> > b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf119.c
> > index 06dcfd6ee966..0981b02790e2 100644
> > --- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf119.c
> > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf119.c
> > @@ -49,7 +49,7 @@ pwm_info(struct nvkm_therm *therm, int line)
> > return -ENODEV;
> > }
> >
> > -static int
> > +int
> > gf119_fan_pwm_ctrl(struct nvkm_therm *therm, int line, bool enable)
> > {
> > struct nvkm_device *device = therm->subdev.device;
> > @@ -63,7 +63,7 @@ gf119_fan_pwm_ctrl(struct nvkm_therm *therm, int line,
> > bool enable)
> > return 0;
> > }
> >
> > -static int
> > +int
> > gf119_fan_pwm_get(struct nvkm_therm *therm, int line, u32 *divs, u32 *duty)
> > {
> > struct nvkm_device *device = therm->subdev.device;
> > @@ -85,7 +85,7 @@ gf119_fan_pwm_get(struct nvkm_therm *therm, int line, u32
> > *divs, u32 *duty)
> > return -EINVAL;
> > }
> >
> > -static int
> > +int
> > gf119_fan_pwm_set(struct nvkm_therm *therm, int line, u32 divs, u32 duty)
> > {
> > struct nvkm_device *device = therm->subdev.device;
> > @@ -102,7 +102,7 @@ gf119_fan_pwm_set(struct nvkm_therm *therm, int line,
> > u32 divs, u32 duty)
> > return 0;
> > }
> >
> > -static int
> > +int
> > gf119_fan_pwm_clock(struct nvkm_therm *therm, int line)
> > {
> > struct nvkm_device *device = therm->subdev.device;
> > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c
> > b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c
> > new file mode 100644
> > index 000000000000..79806a757893
> > --- /dev/null
> > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c
> > @@ -0,0 +1,135 @@
> > +/*
> > + * Copyright 2018 Red Hat Inc.
> > + *
> > + * Permission is hereby granted, free of charge, to any person obtaining a
> > + * copy of this software and associated documentation files (the
> > "Software"),
> > + * to deal in the Software without restriction, including without
> > limitation
> > + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> > + * and/or sell copies of the Software, and to permit persons to whom the
> > + * Software is furnished to do so, subject to the following conditions:
> > + *
> > + * The above copyright notice and this permission notice shall be included
> > in
> > + * all copies or substantial portions of the Software.
> > + *
> > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
> > OR
> > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> > + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
> > + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> > + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> > + * OTHER DEALINGS IN THE SOFTWARE.
> > + *
> > + * Authors: Lyude Paul
> > + */
> > +#include <core/device.h>
> > +
> > +#include "priv.h"
> > +#include "gk104.h"
> > +
> > +void
> > +gk104_clkgate_enable(struct nvkm_therm *base)
> > +{
> > + struct gk104_therm *therm = gk104_therm(base);
> > + struct nvkm_device *dev = therm->base.subdev.device;
> > + const struct gk104_clkgate_engine_info *order = therm-
> > >clkgate_order;
> > + int i;
> > +
> > + /* Program ENG_MANT, ENG_FILTER */
> > + for (i = 0; order[i].engine != NVKM_SUBDEV_NR; i++) {
> > + if (!nvkm_device_subdev(dev, order[i].engine))
> > + continue;
> > +
> > + nvkm_mask(dev, 0x20200 + order[i].offset, 0xff00, 0x4500);
> > + }
> > +
> > + /* magic */
> > + nvkm_wr32(dev, 0x020288, therm->idle_filter->fecs);
> > + nvkm_wr32(dev, 0x02028c, therm->idle_filter->hubmmu);
> > +
> > + /* Enable clockgating (ENG_CLK = RUN->AUTO) */
> > + for (i = 0; order[i].engine != NVKM_SUBDEV_NR; i++) {
> > + if (!nvkm_device_subdev(dev, order[i].engine))
> > + continue;
> > +
> > + nvkm_mask(dev, 0x20200 + order[i].offset, 0x00ff, 0x0045);
> > + }
> > +}
> > +
> > +void
> > +gk104_clkgate_fini(struct nvkm_therm *base, bool suspend)
> > +{
> > + struct gk104_therm *therm = gk104_therm(base);
> > + struct nvkm_device *dev = therm->base.subdev.device;
> > + const struct gk104_clkgate_engine_info *order = therm-
> > >clkgate_order;
> > + int i;
> > +
> > + /* ENG_CLK = AUTO->RUN, ENG_PWR = RUN->AUTO */
> > + for (i = 0; order[i].engine != NVKM_SUBDEV_NR; i++) {
> > + if (!nvkm_device_subdev(dev, order[i].engine))
> > + continue;
> > +
> > + nvkm_mask(dev, 0x20200 + order[i].offset, 0xff, 0x54);
> > + }
>
> shouldn't that be 0x44? Or does nvidia actually set it to that value?
> That would be a little odd, because it sets the mode for ENG_PWR from
> ON to AUTO and I am sure GPUs boot usually with 0x44.
Some of them do start at 0x44 when we boot but yeah, when disabling clockgating
(e.g. right before we enter resume or unload the driver) they do write 0x54.
>
> > +}
> > +
> > +const struct gk104_clkgate_engine_info gk104_clkgate_engine_info[] = {
> > + { NVKM_ENGINE_GR, 0x00 },
> > + { NVKM_ENGINE_MSPDEC, 0x04 },
> > + { NVKM_ENGINE_MSPPP, 0x08 },
> > + { NVKM_ENGINE_MSVLD, 0x0c },
> > + { NVKM_ENGINE_CE0, 0x10 },
> > + { NVKM_ENGINE_CE1, 0x14 },
> > + { NVKM_ENGINE_MSENC, 0x18 },
> > + { NVKM_ENGINE_CE2, 0x1c },
> > + { NVKM_SUBDEV_NR, 0 },
> > +};
> > +
> > +const struct gf100_idle_filter gk104_idle_filter = {
> > + .fecs = 0x00001000,
> > + .hubmmu = 0x00001000,
> > +};
> > +
> > +static const struct nvkm_therm_func
> > +gk104_therm_func = {
> > + .init = gf119_therm_init,
> > + .fini = g84_therm_fini,
> > + .pwm_ctrl = gf119_fan_pwm_ctrl,
> > + .pwm_get = gf119_fan_pwm_get,
> > + .pwm_set = gf119_fan_pwm_set,
> > + .pwm_clock = gf119_fan_pwm_clock,
> > + .temp_get = g84_temp_get,
> > + .fan_sense = gt215_therm_fan_sense,
> > + .program_alarms = nvkm_therm_program_alarms_polling,
> > + .clkgate_enable = gk104_clkgate_enable,
> > + .clkgate_fini = gk104_clkgate_fini,
> > +};
> > +
> > +static int
> > +gk104_therm_new_(const struct nvkm_therm_func *func,
> > + struct nvkm_device *device,
> > + int index,
> > + const struct gk104_clkgate_engine_info *clkgate_order,
> > + const struct gf100_idle_filter *idle_filter,
> > + struct nvkm_therm **ptherm)
> > +{
> > + struct gk104_therm *therm = kzalloc(sizeof(*therm), GFP_KERNEL);
> > +
> > + if (!therm)
> > + return -ENOMEM;
> > +
> > + nvkm_therm_ctor(&therm->base, device, index, func);
> > + *ptherm = &therm->base;
> > + therm->clkgate_order = clkgate_order;
> > + therm->idle_filter = idle_filter;
> > +
> > + return 0;
> > +}
> > +
> > +int
> > +gk104_therm_new(struct nvkm_device *device,
> > + int index, struct nvkm_therm **ptherm)
> > +{
> > + return gk104_therm_new_(&gk104_therm_func, device, index,
> > + gk104_clkgate_engine_info,
> > &gk104_idle_filter,
> > + ptherm);
> > +}
> > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.h
> > b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.h
> > new file mode 100644
> > index 000000000000..293e7743b19b
> > --- /dev/null
> > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.h
> > @@ -0,0 +1,48 @@
> > +/*
> > + * Copyright 2018 Red Hat Inc.
> > + *
> > + * Permission is hereby granted, free of charge, to any person obtaining a
> > + * copy of this software and associated documentation files (the
> > "Software"),
> > + * to deal in the Software without restriction, including without
> > limitation
> > + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> > + * and/or sell copies of the Software, and to permit persons to whom the
> > + * Software is furnished to do so, subject to the following conditions:
> > + *
> > + * The above copyright notice and this permission notice shall be included
> > in
> > + * all copies or substantial portions of the Software.
> > + *
> > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
> > OR
> > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> > + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
> > + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> > + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> > + * OTHER DEALINGS IN THE SOFTWARE.
> > + *
> > + * Authors: Lyude Paul
> > + */
> > +
> > +#ifndef __GK104_THERM_H__
> > +#define __GK104_THERM_H__
> > +#define gk104_therm(p) (container_of((p), struct gk104_therm, base))
> > +
> > +#include <subdev/therm.h>
> > +#include "priv.h"
> > +#include "gf100.h"
> > +
> > +struct gk104_clkgate_engine_info {
> > + enum nvkm_devidx engine;
> > + u8 offset;
> > +};
> > +
> > +struct gk104_therm {
> > + struct nvkm_therm base;
> > +
> > + const struct gk104_clkgate_engine_info *clkgate_order;
> > + const struct gf100_idle_filter *idle_filter;
> > +};
> > +
> > +extern const struct gk104_clkgate_engine_info gk104_clkgate_engine_info[];
> > +extern const struct gf100_idle_filter gk104_idle_filter;
> > +
> > +#endif
> > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h
> > b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h
> > index 1f46e371d7c4..f30202dd88e7 100644
> > --- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h
> > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h
> > @@ -32,6 +32,8 @@
> >
> > int nvkm_therm_new_(const struct nvkm_therm_func *, struct nvkm_device *,
> > int index, struct nvkm_therm **);
> > +void nvkm_therm_ctor(struct nvkm_therm *therm, struct nvkm_device *device,
> > + int index, const struct nvkm_therm_func *func);
> >
> > struct nvkm_fan {
> > struct nvkm_therm *parent;
> > @@ -66,8 +68,6 @@ int nvkm_therm_fan_set(struct nvkm_therm *, bool now, int
> > percent);
> > int nvkm_therm_fan_user_get(struct nvkm_therm *);
> > int nvkm_therm_fan_user_set(struct nvkm_therm *, int percent);
> >
> > -int nvkm_therm_preinit(struct nvkm_therm *);
> > -
> > int nvkm_therm_sensor_init(struct nvkm_therm *);
> > int nvkm_therm_sensor_fini(struct nvkm_therm *, bool suspend);
> > void nvkm_therm_sensor_preinit(struct nvkm_therm *);
> > @@ -96,6 +96,9 @@ struct nvkm_therm_func {
> > int (*fan_sense)(struct nvkm_therm *);
> >
> > void (*program_alarms)(struct nvkm_therm *);
> > +
> > + void (*clkgate_enable)(struct nvkm_therm *);
> > + void (*clkgate_fini)(struct nvkm_therm *, bool);
> > };
> >
> > void nv40_therm_intr(struct nvkm_therm *);
> > @@ -112,8 +115,16 @@ void g84_therm_fini(struct nvkm_therm *);
> > int gt215_therm_fan_sense(struct nvkm_therm *);
> >
> > void g84_therm_init(struct nvkm_therm *);
> > +
> > +int gf119_fan_pwm_ctrl(struct nvkm_therm *, int, bool);
> > +int gf119_fan_pwm_get(struct nvkm_therm *, int, u32 *, u32 *);
> > +int gf119_fan_pwm_set(struct nvkm_therm *, int, u32, u32);
> > +int gf119_fan_pwm_clock(struct nvkm_therm *, int);
> > void gf119_therm_init(struct nvkm_therm *);
> >
> > +void gk104_clkgate_enable(struct nvkm_therm *);
> > +void gk104_clkgate_fini(struct nvkm_therm *, bool);
> > +
> > int nvkm_fanpwm_create(struct nvkm_therm *, struct dcb_gpio_func *);
> > int nvkm_fantog_create(struct nvkm_therm *, struct dcb_gpio_func *);
> > int nvkm_fannil_create(struct nvkm_therm *);
> > --
> > 2.14.3
> >
> > _______________________________________________
> > Nouveau mailing list
> > Nouveau@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/nouveau
^ permalink raw reply [flat|nested] 9+ messages in thread
* [RFC v2 2/4] drm/nouveau: Add support for BLCG on Kepler1
2018-01-26 3:35 [RFC v2 0/4] Implement full clockgating for Kepler1 and 2 Lyude Paul
2018-01-26 3:35 ` [RFC v2 1/4] drm/nouveau: Add support for basic clockgating on Kepler1 Lyude Paul
@ 2018-01-26 3:35 ` Lyude Paul
2018-01-26 3:35 ` [RFC v2 3/4] drm/nouveau: Add support for BLCG on Kepler2 Lyude Paul
2018-01-26 3:35 ` [RFC v2 4/4] drm/nouveau: Add support for SLCG for Kepler2 Lyude Paul
3 siblings, 0 replies; 9+ messages in thread
From: Lyude Paul @ 2018-01-26 3:35 UTC (permalink / raw)
To: nouveau
Cc: Ben Skeggs, David Airlie, Thomas Gleixner, Kate Stewart,
Philippe Ombredanne, Rhys Kidd, Karol Herbst, Greg Kroah-Hartman,
Alexandre Courbot, Martin Peres, linux-kernel, dri-devel
This enables BLCG optimization for kepler1. When using clockgating,
nvidia's firmware has a set of registers which are initially programmed
by the vbios with various engine delays and other mysterious settings
that are safe enough to bring up the GPU. However, the values used by
the vbios are more power hungry then they need to be, so the nvidia driver
writes it's own more optimized set of BLCG settings before enabling
CG_CTRL. This adds support for programming the optimized BLCG values
during engine/subdev init, which enables rather significant power
savings.
This introduces the nvkm_therm_clkgate_init() helper, which we use to
program the optimized BLCG settings before enabling clockgating with
nvkm_therm_clkgate_enable.
As well, this commit shares a lot more code with Fermi since BLCG is
mostly the same there as far as we can tell. In the future, it's likely
we'll reformat the clkgate_packs for kepler1 so that they share a list
of mmio packs with Fermi.
Signed-off-by: Lyude Paul <lyude@redhat.com>
---
.../gpu/drm/nouveau/include/nvkm/subdev/therm.h | 12 ++
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h | 1 +
drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c | 207 +++++++++++++++++++++
drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.h | 55 ++++++
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c | 6 +
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c | 47 +++++
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.h | 35 ++++
drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h | 2 +
drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild | 1 +
drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c | 10 +
drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.c | 67 +++++++
drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c | 1 +
drivers/gpu/drm/nouveau/nvkm/subdev/therm/gt215.c | 2 +-
drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h | 8 +
14 files changed, 453 insertions(+), 1 deletion(-)
create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.h
create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.h
create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.c
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h
index 240b19bb4667..9398d9f09339 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h
@@ -46,6 +46,16 @@ enum nvkm_therm_attr_type {
NVKM_THERM_ATTR_THRS_SHUTDOWN_HYST = 17,
};
+struct nvkm_therm_clkgate_init {
+ u32 addr;
+ u8 count;
+ u32 data;
+};
+
+struct nvkm_therm_clkgate_pack {
+ const struct nvkm_therm_clkgate_init *init;
+};
+
struct nvkm_therm {
const struct nvkm_therm_func *func;
struct nvkm_subdev subdev;
@@ -92,6 +102,8 @@ struct nvkm_therm {
int nvkm_therm_temp_get(struct nvkm_therm *);
int nvkm_therm_fan_sense(struct nvkm_therm *);
int nvkm_therm_cstate(struct nvkm_therm *, int, int);
+void nvkm_therm_clkgate_init(struct nvkm_therm *,
+ const struct nvkm_therm_clkgate_pack *);
void nvkm_therm_clkgate_enable(struct nvkm_therm *);
void nvkm_therm_clkgate_fini(struct nvkm_therm *, bool);
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
index d7c2adb9b543..c8ec3fd97155 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
@@ -137,6 +137,7 @@ struct gf100_gr_func {
int (*rops)(struct gf100_gr *);
int ppc_nr;
const struct gf100_grctx_func *grctx;
+ const struct nvkm_therm_clkgate_pack *clkgate_pack;
struct nvkm_sclass sclass[];
};
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c
index 5e82f94c2245..17cea9c70f7f 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c
@@ -22,6 +22,7 @@
* Authors: Ben Skeggs <bskeggs@redhat.com>
*/
#include "gf100.h"
+#include "gk104.h"
#include "ctxgf100.h"
#include <nvif/class.h>
@@ -173,6 +174,208 @@ gk104_gr_pack_mmio[] = {
{}
};
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_main_0[] = {
+ { 0x4041f0, 1, 0x00004046 },
+ { 0x409890, 1, 0x00000045 },
+ { 0x4098b0, 1, 0x0000007f },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_rstr2d_0[] = {
+ { 0x4078c0, 1, 0x00000042 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_unk_0[] = {
+ { 0x406000, 1, 0x00004044 },
+ { 0x405860, 1, 0x00004042 },
+ { 0x40590c, 1, 0x00004042 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_gcc_0[] = {
+ { 0x408040, 1, 0x00004044 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_sked_0[] = {
+ { 0x407000, 1, 0x00004044 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_unk_1[] = {
+ { 0x405bf0, 1, 0x00004044 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_gpc_ctxctl_0[] = {
+ { 0x41a890, 1, 0x00000042 },
+ { 0x41a8b0, 1, 0x0000007f },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_gpc_unk_0[] = {
+ { 0x418500, 1, 0x00004042 },
+ { 0x418608, 1, 0x00004042 },
+ { 0x418688, 1, 0x00004042 },
+ { 0x418718, 1, 0x00000042 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_gpc_esetup_0[] = {
+ { 0x418828, 1, 0x00000044 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_gpc_tpbus_0[] = {
+ { 0x418bbc, 1, 0x00004042 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_gpc_zcull_0[] = {
+ { 0x418970, 1, 0x00004042 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_gpc_tpconf_0[] = {
+ { 0x418c70, 1, 0x00004042 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_gpc_unk_1[] = {
+ { 0x418cf0, 1, 0x00004042 },
+ { 0x418d70, 1, 0x00004042 },
+ { 0x418f0c, 1, 0x00004042 },
+ { 0x418e0c, 1, 0x00004042 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_gpc_gcc_0[] = {
+ { 0x419020, 1, 0x00004042 },
+ { 0x419038, 1, 0x00000042 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_gpc_ffb_0[] = {
+ { 0x418898, 1, 0x00000042 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_gpc_tex_0[] = {
+ { 0x419a40, 9, 0x00004042 },
+ { 0x419acc, 1, 0x00004047 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_gpc_poly_0[] = {
+ { 0x419868, 1, 0x00000042 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_gpc_l1c_0[] = {
+ { 0x419ccc, 3, 0x00000042 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_gpc_unk_2[] = {
+ { 0x419c70, 1, 0x00004045 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_gpc_mp_0[] = {
+ { 0x419fd0, 1, 0x00004043 },
+ { 0x419fd8, 1, 0x00004049 },
+ { 0x419fe0, 2, 0x00004042 },
+ { 0x419ff0, 1, 0x00004046 },
+ { 0x419ff8, 1, 0x00004042 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_gpc_ppc_0[] = {
+ { 0x41be28, 1, 0x00000042 },
+ { 0x41bfe8, 1, 0x00004042 },
+ { 0x41bed0, 1, 0x00004042 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_rop_zrop_0[] = {
+ { 0x408810, 2, 0x00004042 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_rop_0[] = {
+ { 0x408a80, 6, 0x00004042 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_rop_crop_0[] = {
+ { 0x4089a8, 1, 0x00004042 },
+ { 0x4089b0, 1, 0x00000042 },
+ { 0x4089b8, 1, 0x00004042 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_clkgate_blcg_init_pxbar_0[] = {
+ { 0x13c820, 1, 0x0001007f },
+ { 0x13cbe0, 1, 0x00000042 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_pack
+gk104_clkgate_pack[] = {
+ { gk104_clkgate_blcg_init_main_0 },
+ { gk104_clkgate_blcg_init_rstr2d_0 },
+ { gk104_clkgate_blcg_init_unk_0 },
+ { gk104_clkgate_blcg_init_gcc_0 },
+ { gk104_clkgate_blcg_init_sked_0 },
+ { gk104_clkgate_blcg_init_unk_1 },
+ { gk104_clkgate_blcg_init_gpc_ctxctl_0 },
+ { gk104_clkgate_blcg_init_gpc_unk_0 },
+ { gk104_clkgate_blcg_init_gpc_esetup_0 },
+ { gk104_clkgate_blcg_init_gpc_tpbus_0 },
+ { gk104_clkgate_blcg_init_gpc_zcull_0 },
+ { gk104_clkgate_blcg_init_gpc_tpconf_0 },
+ { gk104_clkgate_blcg_init_gpc_unk_1 },
+ { gk104_clkgate_blcg_init_gpc_gcc_0 },
+ { gk104_clkgate_blcg_init_gpc_ffb_0 },
+ { gk104_clkgate_blcg_init_gpc_tex_0 },
+ { gk104_clkgate_blcg_init_gpc_poly_0 },
+ { gk104_clkgate_blcg_init_gpc_l1c_0 },
+ { gk104_clkgate_blcg_init_gpc_unk_2 },
+ { gk104_clkgate_blcg_init_gpc_mp_0 },
+ { gk104_clkgate_blcg_init_gpc_ppc_0 },
+ { gk104_clkgate_blcg_init_rop_zrop_0 },
+ { gk104_clkgate_blcg_init_rop_0 },
+ { gk104_clkgate_blcg_init_rop_crop_0 },
+ { gk104_clkgate_blcg_init_pxbar_0 },
+ {}
+};
+
/*******************************************************************************
* PGRAPH engine/subdev functions
******************************************************************************/
@@ -214,6 +417,9 @@ gk104_gr_init(struct gf100_gr *gr)
gr->func->init_gpc_mmu(gr);
gf100_gr_mmio(gr, gr->func->mmio);
+ if (gr->func->clkgate_pack)
+ nvkm_therm_clkgate_init(gr->base.engine.subdev.device->therm,
+ gr->func->clkgate_pack);
nvkm_wr32(device, GPC_UNIT(0, 0x3018), 0x00000001);
@@ -338,6 +544,7 @@ gk104_gr = {
.rops = gf100_gr_rops,
.ppc_nr = 1,
.grctx = &gk104_grctx,
+ .clkgate_pack = gk104_clkgate_pack,
.sclass = {
{ -1, -1, FERMI_TWOD_A },
{ -1, -1, KEPLER_INLINE_TO_MEMORY_A },
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.h
new file mode 100644
index 000000000000..a24c177365d1
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2018 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Lyude Paul <lyude@redhat.com>
+ */
+#ifndef __GK104_GR_H__
+#define __GK104_GR_H__
+
+#include <subdev/therm.h>
+
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_main_0[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_rstr2d_0[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_unk_0[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_gcc_0[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_sked_0[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_unk_1[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_gpc_ctxctl_0[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_gpc_unk_0[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_gpc_esetup_0[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_gpc_tpbus_0[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_gpc_zcull_0[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_gpc_tpconf_0[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_gpc_unk_1[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_gpc_gcc_0[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_gpc_ffb_0[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_gpc_tex_0[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_gpc_poly_0[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_gpc_l1c_0[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_gpc_unk_2[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_gpc_mp_0[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_gpc_ppc_0[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_rop_zrop_0[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_rop_0[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_rop_crop_0[];
+extern const struct nvkm_therm_clkgate_init gk104_clkgate_blcg_init_pxbar_0[];
+
+#endif
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c
index 47d28c279707..cdc4e0a2cc6b 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c
@@ -26,6 +26,7 @@
#include <core/memory.h>
#include <core/option.h>
+#include <subdev/therm.h>
void
gf100_fb_intr(struct nvkm_fb *base)
@@ -92,6 +93,11 @@ gf100_fb_init(struct nvkm_fb *base)
if (fb->r100c10_page)
nvkm_wr32(device, 0x100c10, fb->r100c10 >> 8);
+
+ if (base->func->clkgate_pack) {
+ nvkm_therm_clkgate_init(device->therm,
+ base->func->clkgate_pack);
+ }
}
void *
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c
index 0a6e8eaad42c..48fd98e08baa 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c
@@ -20,10 +20,56 @@
* OTHER DEALINGS IN THE SOFTWARE.
*
* Authors: Ben Skeggs
+ * Lyude Paul
*/
+#include "gk104.h"
#include "gf100.h"
#include "ram.h"
+/*
+ *******************************************************************************
+ * PGRAPH registers for clockgating
+ *******************************************************************************
+ */
+const struct nvkm_therm_clkgate_init
+gk104_fb_clkgate_blcg_init_unk_0[] = {
+ { 0x100d10, 1, 0x0000c244 },
+ { 0x100d30, 1, 0x0000c242 },
+ { 0x100d3c, 1, 0x00000242 },
+ { 0x100d48, 1, 0x00000242 },
+ { 0x100d1c, 1, 0x00000042 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_fb_clkgate_blcg_init_vm_0[] = {
+ { 0x100c98, 1, 0x00000242 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_fb_clkgate_blcg_init_main_0[] = {
+ { 0x10f000, 1, 0x00000042 },
+ { 0x17e030, 1, 0x00000044 },
+ { 0x17e040, 1, 0x00000044 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk104_fb_clkgate_blcg_init_bcast_0[] = {
+ { 0x17ea60, 4, 0x00000044 },
+ {}
+};
+
+static const struct nvkm_therm_clkgate_pack
+gk104_fb_clkgate_pack[] = {
+ { gk104_fb_clkgate_blcg_init_unk_0 },
+ { gk104_fb_clkgate_blcg_init_vm_0 },
+ { gk104_fb_clkgate_blcg_init_main_0 },
+ { gk104_fb_clkgate_blcg_init_bcast_0 },
+ {}
+};
+
static const struct nvkm_fb_func
gk104_fb = {
.dtor = gf100_fb_dtor,
@@ -33,6 +79,7 @@ gk104_fb = {
.intr = gf100_fb_intr,
.ram_new = gk104_ram_new,
.default_bigpage = 17,
+ .clkgate_pack = gk104_fb_clkgate_pack,
};
int
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.h b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.h
new file mode 100644
index 000000000000..b3c78e4ff706
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2018 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Lyude Paul
+ */
+
+#ifndef __GK104_FB_H__
+#define __GK104_FB_H__
+
+#include <subdev/therm.h>
+
+extern const struct nvkm_therm_clkgate_init gk104_fb_clkgate_blcg_init_unk_0[];
+extern const struct nvkm_therm_clkgate_init gk104_fb_clkgate_blcg_init_vm_0[];
+extern const struct nvkm_therm_clkgate_init gk104_fb_clkgate_blcg_init_main_0[];
+extern const struct nvkm_therm_clkgate_init gk104_fb_clkgate_blcg_init_bcast_0[];
+
+#endif
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h
index 9351188d5d76..414a423e0e55 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h
@@ -3,6 +3,7 @@
#define __NVKM_FB_PRIV_H__
#define nvkm_fb(p) container_of((p), struct nvkm_fb, subdev)
#include <subdev/fb.h>
+#include <subdev/therm.h>
struct nvkm_bios;
struct nvkm_fb_func {
@@ -27,6 +28,7 @@ struct nvkm_fb_func {
int (*ram_new)(struct nvkm_fb *, struct nvkm_ram **);
u8 default_bigpage;
+ const struct nvkm_therm_clkgate_pack *clkgate_pack;
};
void nvkm_fb_ctor(const struct nvkm_fb_func *, struct nvkm_device *device,
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild
index 4bac4772d8ed..550702eab0b1 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild
@@ -9,6 +9,7 @@ nvkm-y += nvkm/subdev/therm/nv40.o
nvkm-y += nvkm/subdev/therm/nv50.o
nvkm-y += nvkm/subdev/therm/g84.o
nvkm-y += nvkm/subdev/therm/gt215.o
+nvkm-y += nvkm/subdev/therm/gf100.o
nvkm-y += nvkm/subdev/therm/gf119.o
nvkm-y += nvkm/subdev/therm/gk104.o
nvkm-y += nvkm/subdev/therm/gm107.o
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
index e4c96e46db8f..bf62303571b3 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
@@ -391,6 +391,16 @@ nvkm_therm_init(struct nvkm_subdev *subdev)
return 0;
}
+void
+nvkm_therm_clkgate_init(struct nvkm_therm *therm,
+ const struct nvkm_therm_clkgate_pack *p)
+{
+ if (!therm->func->clkgate_init || !therm->clkgating_enabled)
+ return;
+
+ therm->func->clkgate_init(therm, p);
+}
+
static void *
nvkm_therm_dtor(struct nvkm_subdev *subdev)
{
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.c
new file mode 100644
index 000000000000..971623404311
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.c
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2018 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Lyude Paul
+ */
+#include <core/device.h>
+
+#include "priv.h"
+
+void
+gf100_clkgate_init(struct nvkm_therm *therm,
+ const struct nvkm_therm_clkgate_pack *p)
+{
+ struct nvkm_device *device = therm->subdev.device;
+ int i;
+ u32 next, addr;
+
+ for (i = 0; i; i++) {
+ next = p->init[i].addr + p->init[i].count * 8;
+ addr = p->init[i].addr;
+
+ while (addr < next) {
+ nvkm_wr32(device, addr, p->init[i].data);
+ addr += 8;
+ }
+ }
+}
+
+static const struct nvkm_therm_func
+gf100_therm_func = {
+ .init = gt215_therm_init,
+ .fini = g84_therm_fini,
+ .pwm_ctrl = nv50_fan_pwm_ctrl,
+ .pwm_get = nv50_fan_pwm_get,
+ .pwm_set = nv50_fan_pwm_set,
+ .pwm_clock = nv50_fan_pwm_clock,
+ .temp_get = g84_temp_get,
+ .fan_sense = gt215_therm_fan_sense,
+ .program_alarms = nvkm_therm_program_alarms_polling,
+ /* TODO: Fermi clockgating isn't understood fully yet, so we leave it
+ * disabled here */
+};
+
+int
+gf100_therm_new(struct nvkm_device *device, int index,
+ struct nvkm_therm **ptherm)
+{
+ return nvkm_therm_new_(&gf100_therm_func, device, index, ptherm);
+}
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c
index 79806a757893..4e03971d2e3d 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c
@@ -100,6 +100,7 @@ gk104_therm_func = {
.temp_get = g84_temp_get,
.fan_sense = gt215_therm_fan_sense,
.program_alarms = nvkm_therm_program_alarms_polling,
+ .clkgate_init = gf100_clkgate_init,
.clkgate_enable = gk104_clkgate_enable,
.clkgate_fini = gk104_clkgate_fini,
};
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gt215.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gt215.c
index c08097f2aff5..4caf401d001a 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gt215.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gt215.c
@@ -36,7 +36,7 @@ gt215_therm_fan_sense(struct nvkm_therm *therm)
return -ENODEV;
}
-static void
+void
gt215_therm_init(struct nvkm_therm *therm)
{
struct nvkm_device *device = therm->subdev.device;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h
index f30202dd88e7..a737e9b8a584 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h
@@ -97,6 +97,8 @@ struct nvkm_therm_func {
void (*program_alarms)(struct nvkm_therm *);
+ void (*clkgate_init)(struct nvkm_therm *,
+ const struct nvkm_therm_clkgate_pack *);
void (*clkgate_enable)(struct nvkm_therm *);
void (*clkgate_fini)(struct nvkm_therm *, bool);
};
@@ -114,6 +116,9 @@ void g84_therm_fini(struct nvkm_therm *);
int gt215_therm_fan_sense(struct nvkm_therm *);
+void gf100_clkgate_init(struct nvkm_therm *,
+ const struct nvkm_therm_clkgate_pack *);
+
void g84_therm_init(struct nvkm_therm *);
int gf119_fan_pwm_ctrl(struct nvkm_therm *, int, bool);
@@ -122,6 +127,9 @@ int gf119_fan_pwm_set(struct nvkm_therm *, int, u32, u32);
int gf119_fan_pwm_clock(struct nvkm_therm *, int);
void gf119_therm_init(struct nvkm_therm *);
+void gt215_therm_init(struct nvkm_therm *therm);
+
+void gk104_therm_init(struct nvkm_therm *);
void gk104_clkgate_enable(struct nvkm_therm *);
void gk104_clkgate_fini(struct nvkm_therm *, bool);
--
2.14.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* [RFC v2 3/4] drm/nouveau: Add support for BLCG on Kepler2
2018-01-26 3:35 [RFC v2 0/4] Implement full clockgating for Kepler1 and 2 Lyude Paul
2018-01-26 3:35 ` [RFC v2 1/4] drm/nouveau: Add support for basic clockgating on Kepler1 Lyude Paul
2018-01-26 3:35 ` [RFC v2 2/4] drm/nouveau: Add support for BLCG " Lyude Paul
@ 2018-01-26 3:35 ` Lyude Paul
2018-01-26 7:53 ` Ilia Mirkin
2018-01-26 3:35 ` [RFC v2 4/4] drm/nouveau: Add support for SLCG for Kepler2 Lyude Paul
3 siblings, 1 reply; 9+ messages in thread
From: Lyude Paul @ 2018-01-26 3:35 UTC (permalink / raw)
To: nouveau
Cc: Ben Skeggs, David Airlie, Greg Kroah-Hartman, Thomas Gleixner,
Kate Stewart, Alexandre Courbot, Karol Herbst, Ilia Mirkin,
linux-kernel, dri-devel
Same as the previous patch, but for Kepler2 now
Signed-off-by: Lyude Paul <lyude@redhat.com>
---
drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | 1 +
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 8 +--
drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c | 62 ++++++++++++++++++++
drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild | 1 +
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c | 71 +++++++++++++++++++++++
5 files changed, 139 insertions(+), 4 deletions(-)
create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
index adb78f7d083a..92be0e5269c6 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
@@ -75,6 +75,7 @@ int mcp89_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
int gf100_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
int gf108_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
int gk104_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int gk110_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
int gk20a_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
int gm107_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
int gm200_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index 74bd09b1c893..7590a30b7ff0 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -1812,7 +1812,7 @@ nvf0_chipset = {
.bus = gf100_bus_new,
.clk = gk104_clk_new,
.devinit = gf100_devinit_new,
- .fb = gk104_fb_new,
+ .fb = gk110_fb_new,
.fuse = gf100_fuse_new,
.gpio = gk104_gpio_new,
.i2c = gk104_i2c_new,
@@ -1850,7 +1850,7 @@ nvf1_chipset = {
.bus = gf100_bus_new,
.clk = gk104_clk_new,
.devinit = gf100_devinit_new,
- .fb = gk104_fb_new,
+ .fb = gk110_fb_new,
.fuse = gf100_fuse_new,
.gpio = gk104_gpio_new,
.i2c = gk104_i2c_new,
@@ -1888,7 +1888,7 @@ nv106_chipset = {
.bus = gf100_bus_new,
.clk = gk104_clk_new,
.devinit = gf100_devinit_new,
- .fb = gk104_fb_new,
+ .fb = gk110_fb_new,
.fuse = gf100_fuse_new,
.gpio = gk104_gpio_new,
.i2c = gk104_i2c_new,
@@ -1926,7 +1926,7 @@ nv108_chipset = {
.bus = gf100_bus_new,
.clk = gk104_clk_new,
.devinit = gf100_devinit_new,
- .fb = gk104_fb_new,
+ .fb = gk110_fb_new,
.fuse = gf100_fuse_new,
.gpio = gk104_gpio_new,
.i2c = gk104_i2c_new,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
index a38e19b61c1d..38d3328e45f1 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
@@ -22,6 +22,7 @@
* Authors: Ben Skeggs <bskeggs@redhat.com>
*/
#include "gf100.h"
+#include "gk104.h"
#include "ctxgf100.h"
#include <subdev/timer.h>
@@ -156,6 +157,66 @@ gk110_gr_pack_mmio[] = {
{}
};
+const struct nvkm_therm_clkgate_init
+gk110_clkgate_blcg_init_sked_0[] = {
+ { 0x407000, 1, 0x00004041 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk110_clkgate_blcg_init_gpc_gcc_0[] = {
+ { 0x419020, 1, 0x00000042 },
+ { 0x419038, 1, 0x00000042 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk110_clkgate_blcg_init_gpc_l1c_0[] = {
+ { 0x419cd4, 2, 0x00004042 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk110_clkgate_blcg_init_gpc_mp_0[] = {
+ { 0x419fd0, 1, 0x00004043 },
+ { 0x419fd8, 1, 0x00004049 },
+ { 0x419fe0, 2, 0x00004042 },
+ { 0x419ff0, 1, 0x00000046 },
+ { 0x419ff8, 1, 0x00004042 },
+ { 0x419f90, 1, 0x00004042 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_pack
+gk110_clkgate_pack[] = {
+ { gk104_clkgate_blcg_init_main_0 },
+ { gk104_clkgate_blcg_init_rstr2d_0 },
+ { gk104_clkgate_blcg_init_unk_0 },
+ { gk104_clkgate_blcg_init_gcc_0 },
+ { gk110_clkgate_blcg_init_sked_0 },
+ { gk104_clkgate_blcg_init_unk_1 },
+ { gk104_clkgate_blcg_init_gpc_ctxctl_0 },
+ { gk104_clkgate_blcg_init_gpc_unk_0 },
+ { gk104_clkgate_blcg_init_gpc_esetup_0 },
+ { gk104_clkgate_blcg_init_gpc_tpbus_0 },
+ { gk104_clkgate_blcg_init_gpc_zcull_0 },
+ { gk104_clkgate_blcg_init_gpc_tpconf_0 },
+ { gk104_clkgate_blcg_init_gpc_unk_1 },
+ { gk110_clkgate_blcg_init_gpc_gcc_0 },
+ { gk104_clkgate_blcg_init_gpc_ffb_0 },
+ { gk104_clkgate_blcg_init_gpc_tex_0 },
+ { gk104_clkgate_blcg_init_gpc_poly_0 },
+ { gk110_clkgate_blcg_init_gpc_l1c_0 },
+ { gk104_clkgate_blcg_init_gpc_unk_2 },
+ { gk110_clkgate_blcg_init_gpc_mp_0 },
+ { gk104_clkgate_blcg_init_gpc_ppc_0 },
+ { gk104_clkgate_blcg_init_rop_zrop_0 },
+ { gk104_clkgate_blcg_init_rop_0 },
+ { gk104_clkgate_blcg_init_rop_crop_0 },
+ { gk104_clkgate_blcg_init_pxbar_0 },
+ {}
+};
+
/*******************************************************************************
* PGRAPH engine/subdev functions
******************************************************************************/
@@ -192,6 +253,7 @@ gk110_gr = {
.rops = gf100_gr_rops,
.ppc_nr = 2,
.grctx = &gk110_grctx,
+ .clkgate_pack = gk110_clkgate_pack,
.sclass = {
{ -1, -1, FERMI_TWOD_A },
{ -1, -1, KEPLER_INLINE_TO_MEMORY_B },
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild
index 2571530e82f1..b4f22cce5d43 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild
@@ -22,6 +22,7 @@ nvkm-y += nvkm/subdev/fb/mcp89.o
nvkm-y += nvkm/subdev/fb/gf100.o
nvkm-y += nvkm/subdev/fb/gf108.o
nvkm-y += nvkm/subdev/fb/gk104.o
+nvkm-y += nvkm/subdev/fb/gk110.o
nvkm-y += nvkm/subdev/fb/gk20a.o
nvkm-y += nvkm/subdev/fb/gm107.o
nvkm-y += nvkm/subdev/fb/gm200.o
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c
new file mode 100644
index 000000000000..5c8feef151a4
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2017 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Lyude Paul
+ */
+#include "gf100.h"
+#include "gk104.h"
+#include "ram.h"
+#include <subdev/therm.h>
+#include <subdev/fb.h>
+
+/*
+ *******************************************************************************
+ * PGRAPH registers for clockgating
+ *******************************************************************************
+ */
+
+const struct nvkm_therm_clkgate_init
+gk110_fb_clkgate_blcg_init_unk_0[] = {
+ { 0x100d10, 1, 0x0000c242 },
+ { 0x100d30, 1, 0x0000c242 },
+ { 0x100d3c, 1, 0x00000242 },
+ { 0x100d48, 1, 0x0000c242 },
+ { 0x100d1c, 1, 0x00000042 },
+ {}
+};
+
+static const struct nvkm_therm_clkgate_pack
+gk110_fb_clkgate_pack[] = {
+ { gk110_fb_clkgate_blcg_init_unk_0 },
+ { gk104_fb_clkgate_blcg_init_vm_0 },
+ { gk104_fb_clkgate_blcg_init_main_0 },
+ { gk104_fb_clkgate_blcg_init_bcast_0 },
+ {}
+};
+
+static const struct nvkm_fb_func
+gk110_fb = {
+ .dtor = gf100_fb_dtor,
+ .oneinit = gf100_fb_oneinit,
+ .init = gf100_fb_init,
+ .init_page = gf100_fb_init_page,
+ .intr = gf100_fb_intr,
+ .ram_new = gk104_ram_new,
+ .default_bigpage = 17,
+ .clkgate_pack = gk110_fb_clkgate_pack,
+};
+
+int
+gk110_fb_new(struct nvkm_device *device, int index, struct nvkm_fb **pfb)
+{
+ return gf100_fb_new_(&gk110_fb, device, index, pfb);
+}
--
2.14.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [RFC v2 3/4] drm/nouveau: Add support for BLCG on Kepler2
2018-01-26 3:35 ` [RFC v2 3/4] drm/nouveau: Add support for BLCG on Kepler2 Lyude Paul
@ 2018-01-26 7:53 ` Ilia Mirkin
2018-01-26 18:11 ` Lyude Paul
0 siblings, 1 reply; 9+ messages in thread
From: Ilia Mirkin @ 2018-01-26 7:53 UTC (permalink / raw)
To: Lyude Paul
Cc: nouveau, Ben Skeggs, David Airlie, Greg Kroah-Hartman,
Thomas Gleixner, Kate Stewart, Alexandre Courbot, Karol Herbst,
LKML, dri-devel
On Thu, Jan 25, 2018 at 10:35 PM, Lyude Paul <lyude@redhat.com> wrote:
> Same as the previous patch, but for Kepler2 now
>
> Signed-off-by: Lyude Paul <lyude@redhat.com>
> ---
> drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | 1 +
> drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 8 +--
> drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c | 62 ++++++++++++++++++++
> drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild | 1 +
> drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c | 71 +++++++++++++++++++++++
> 5 files changed, 139 insertions(+), 4 deletions(-)
> create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c
>
> diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
> index adb78f7d083a..92be0e5269c6 100644
> --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
> +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
> @@ -75,6 +75,7 @@ int mcp89_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
> int gf100_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
> int gf108_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
> int gk104_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
> +int gk110_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
> int gk20a_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
> int gm107_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
> int gm200_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
> diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
> index 74bd09b1c893..7590a30b7ff0 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
> @@ -1812,7 +1812,7 @@ nvf0_chipset = {
> .bus = gf100_bus_new,
> .clk = gk104_clk_new,
> .devinit = gf100_devinit_new,
> - .fb = gk104_fb_new,
> + .fb = gk110_fb_new,
> .fuse = gf100_fuse_new,
> .gpio = gk104_gpio_new,
> .i2c = gk104_i2c_new,
> @@ -1850,7 +1850,7 @@ nvf1_chipset = {
> .bus = gf100_bus_new,
> .clk = gk104_clk_new,
> .devinit = gf100_devinit_new,
> - .fb = gk104_fb_new,
> + .fb = gk110_fb_new,
> .fuse = gf100_fuse_new,
> .gpio = gk104_gpio_new,
> .i2c = gk104_i2c_new,
> @@ -1888,7 +1888,7 @@ nv106_chipset = {
> .bus = gf100_bus_new,
> .clk = gk104_clk_new,
> .devinit = gf100_devinit_new,
> - .fb = gk104_fb_new,
> + .fb = gk110_fb_new,
> .fuse = gf100_fuse_new,
> .gpio = gk104_gpio_new,
> .i2c = gk104_i2c_new,
> @@ -1926,7 +1926,7 @@ nv108_chipset = {
> .bus = gf100_bus_new,
> .clk = gk104_clk_new,
> .devinit = gf100_devinit_new,
> - .fb = gk104_fb_new,
> + .fb = gk110_fb_new,
> .fuse = gf100_fuse_new,
> .gpio = gk104_gpio_new,
> .i2c = gk104_i2c_new,
> diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
> index a38e19b61c1d..38d3328e45f1 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
> @@ -22,6 +22,7 @@
> * Authors: Ben Skeggs <bskeggs@redhat.com>
> */
> #include "gf100.h"
> +#include "gk104.h"
> #include "ctxgf100.h"
>
> #include <subdev/timer.h>
> @@ -156,6 +157,66 @@ gk110_gr_pack_mmio[] = {
> {}
> };
>
> +const struct nvkm_therm_clkgate_init
These should all be static, no?
> +gk110_clkgate_blcg_init_sked_0[] = {
> + { 0x407000, 1, 0x00004041 },
> + {}
> +};
> +
> +const struct nvkm_therm_clkgate_init
> +gk110_clkgate_blcg_init_gpc_gcc_0[] = {
> + { 0x419020, 1, 0x00000042 },
> + { 0x419038, 1, 0x00000042 },
> + {}
> +};
> +
> +const struct nvkm_therm_clkgate_init
> +gk110_clkgate_blcg_init_gpc_l1c_0[] = {
> + { 0x419cd4, 2, 0x00004042 },
> + {}
> +};
> +
> +const struct nvkm_therm_clkgate_init
> +gk110_clkgate_blcg_init_gpc_mp_0[] = {
> + { 0x419fd0, 1, 0x00004043 },
> + { 0x419fd8, 1, 0x00004049 },
> + { 0x419fe0, 2, 0x00004042 },
> + { 0x419ff0, 1, 0x00000046 },
> + { 0x419ff8, 1, 0x00004042 },
> + { 0x419f90, 1, 0x00004042 },
> + {}
> +};
> +
> +const struct nvkm_therm_clkgate_pack
> +gk110_clkgate_pack[] = {
> + { gk104_clkgate_blcg_init_main_0 },
> + { gk104_clkgate_blcg_init_rstr2d_0 },
> + { gk104_clkgate_blcg_init_unk_0 },
> + { gk104_clkgate_blcg_init_gcc_0 },
> + { gk110_clkgate_blcg_init_sked_0 },
> + { gk104_clkgate_blcg_init_unk_1 },
> + { gk104_clkgate_blcg_init_gpc_ctxctl_0 },
> + { gk104_clkgate_blcg_init_gpc_unk_0 },
> + { gk104_clkgate_blcg_init_gpc_esetup_0 },
> + { gk104_clkgate_blcg_init_gpc_tpbus_0 },
> + { gk104_clkgate_blcg_init_gpc_zcull_0 },
> + { gk104_clkgate_blcg_init_gpc_tpconf_0 },
> + { gk104_clkgate_blcg_init_gpc_unk_1 },
> + { gk110_clkgate_blcg_init_gpc_gcc_0 },
> + { gk104_clkgate_blcg_init_gpc_ffb_0 },
> + { gk104_clkgate_blcg_init_gpc_tex_0 },
> + { gk104_clkgate_blcg_init_gpc_poly_0 },
> + { gk110_clkgate_blcg_init_gpc_l1c_0 },
> + { gk104_clkgate_blcg_init_gpc_unk_2 },
> + { gk110_clkgate_blcg_init_gpc_mp_0 },
> + { gk104_clkgate_blcg_init_gpc_ppc_0 },
> + { gk104_clkgate_blcg_init_rop_zrop_0 },
> + { gk104_clkgate_blcg_init_rop_0 },
> + { gk104_clkgate_blcg_init_rop_crop_0 },
> + { gk104_clkgate_blcg_init_pxbar_0 },
> + {}
> +};
> +
> /*******************************************************************************
> * PGRAPH engine/subdev functions
> ******************************************************************************/
> @@ -192,6 +253,7 @@ gk110_gr = {
> .rops = gf100_gr_rops,
> .ppc_nr = 2,
> .grctx = &gk110_grctx,
> + .clkgate_pack = gk110_clkgate_pack,
> .sclass = {
> { -1, -1, FERMI_TWOD_A },
> { -1, -1, KEPLER_INLINE_TO_MEMORY_B },
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild
> index 2571530e82f1..b4f22cce5d43 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild
> @@ -22,6 +22,7 @@ nvkm-y += nvkm/subdev/fb/mcp89.o
> nvkm-y += nvkm/subdev/fb/gf100.o
> nvkm-y += nvkm/subdev/fb/gf108.o
> nvkm-y += nvkm/subdev/fb/gk104.o
> +nvkm-y += nvkm/subdev/fb/gk110.o
> nvkm-y += nvkm/subdev/fb/gk20a.o
> nvkm-y += nvkm/subdev/fb/gm107.o
> nvkm-y += nvkm/subdev/fb/gm200.o
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c
> new file mode 100644
> index 000000000000..5c8feef151a4
> --- /dev/null
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c
> @@ -0,0 +1,71 @@
> +/*
> + * Copyright 2017 Red Hat Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + *
> + * Authors: Lyude Paul
> + */
> +#include "gf100.h"
> +#include "gk104.h"
> +#include "ram.h"
> +#include <subdev/therm.h>
> +#include <subdev/fb.h>
> +
> +/*
> + *******************************************************************************
> + * PGRAPH registers for clockgating
> + *******************************************************************************
> + */
> +
> +const struct nvkm_therm_clkgate_init
> +gk110_fb_clkgate_blcg_init_unk_0[] = {
> + { 0x100d10, 1, 0x0000c242 },
> + { 0x100d30, 1, 0x0000c242 },
> + { 0x100d3c, 1, 0x00000242 },
> + { 0x100d48, 1, 0x0000c242 },
> + { 0x100d1c, 1, 0x00000042 },
> + {}
> +};
> +
> +static const struct nvkm_therm_clkgate_pack
> +gk110_fb_clkgate_pack[] = {
> + { gk110_fb_clkgate_blcg_init_unk_0 },
> + { gk104_fb_clkgate_blcg_init_vm_0 },
> + { gk104_fb_clkgate_blcg_init_main_0 },
> + { gk104_fb_clkgate_blcg_init_bcast_0 },
> + {}
> +};
> +
> +static const struct nvkm_fb_func
> +gk110_fb = {
> + .dtor = gf100_fb_dtor,
> + .oneinit = gf100_fb_oneinit,
> + .init = gf100_fb_init,
> + .init_page = gf100_fb_init_page,
> + .intr = gf100_fb_intr,
> + .ram_new = gk104_ram_new,
> + .default_bigpage = 17,
> + .clkgate_pack = gk110_fb_clkgate_pack,
> +};
> +
> +int
> +gk110_fb_new(struct nvkm_device *device, int index, struct nvkm_fb **pfb)
> +{
> + return gf100_fb_new_(&gk110_fb, device, index, pfb);
> +}
> --
> 2.14.3
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [RFC v2 3/4] drm/nouveau: Add support for BLCG on Kepler2
2018-01-26 7:53 ` Ilia Mirkin
@ 2018-01-26 18:11 ` Lyude Paul
0 siblings, 0 replies; 9+ messages in thread
From: Lyude Paul @ 2018-01-26 18:11 UTC (permalink / raw)
To: Ilia Mirkin
Cc: nouveau, Ben Skeggs, David Airlie, Greg Kroah-Hartman,
Thomas Gleixner, Kate Stewart, Alexandre Courbot, Karol Herbst,
LKML, dri-devel
On Fri, 2018-01-26 at 02:53 -0500, Ilia Mirkin wrote:
> On Thu, Jan 25, 2018 at 10:35 PM, Lyude Paul <lyude@redhat.com> wrote:
> > Same as the previous patch, but for Kepler2 now
> >
> > Signed-off-by: Lyude Paul <lyude@redhat.com>
> > ---
> > drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | 1 +
> > drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 8 +--
> > drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c | 62 ++++++++++++++++++++
> > drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild | 1 +
> > drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c | 71
> > +++++++++++++++++++++++
> > 5 files changed, 139 insertions(+), 4 deletions(-)
> > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c
> >
> > diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
> > b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
> > index adb78f7d083a..92be0e5269c6 100644
> > --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
> > +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
> > @@ -75,6 +75,7 @@ int mcp89_fb_new(struct nvkm_device *, int, struct nvkm_fb
> > **);
> > int gf100_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
> > int gf108_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
> > int gk104_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
> > +int gk110_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
> > int gk20a_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
> > int gm107_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
> > int gm200_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
> > diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
> > b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
> > index 74bd09b1c893..7590a30b7ff0 100644
> > --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
> > +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
> > @@ -1812,7 +1812,7 @@ nvf0_chipset = {
> > .bus = gf100_bus_new,
> > .clk = gk104_clk_new,
> > .devinit = gf100_devinit_new,
> > - .fb = gk104_fb_new,
> > + .fb = gk110_fb_new,
> > .fuse = gf100_fuse_new,
> > .gpio = gk104_gpio_new,
> > .i2c = gk104_i2c_new,
> > @@ -1850,7 +1850,7 @@ nvf1_chipset = {
> > .bus = gf100_bus_new,
> > .clk = gk104_clk_new,
> > .devinit = gf100_devinit_new,
> > - .fb = gk104_fb_new,
> > + .fb = gk110_fb_new,
> > .fuse = gf100_fuse_new,
> > .gpio = gk104_gpio_new,
> > .i2c = gk104_i2c_new,
> > @@ -1888,7 +1888,7 @@ nv106_chipset = {
> > .bus = gf100_bus_new,
> > .clk = gk104_clk_new,
> > .devinit = gf100_devinit_new,
> > - .fb = gk104_fb_new,
> > + .fb = gk110_fb_new,
> > .fuse = gf100_fuse_new,
> > .gpio = gk104_gpio_new,
> > .i2c = gk104_i2c_new,
> > @@ -1926,7 +1926,7 @@ nv108_chipset = {
> > .bus = gf100_bus_new,
> > .clk = gk104_clk_new,
> > .devinit = gf100_devinit_new,
> > - .fb = gk104_fb_new,
> > + .fb = gk110_fb_new,
> > .fuse = gf100_fuse_new,
> > .gpio = gk104_gpio_new,
> > .i2c = gk104_i2c_new,
> > diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
> > b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
> > index a38e19b61c1d..38d3328e45f1 100644
> > --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
> > +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
> > @@ -22,6 +22,7 @@
> > * Authors: Ben Skeggs <bskeggs@redhat.com>
> > */
> > #include "gf100.h"
> > +#include "gk104.h"
> > #include "ctxgf100.h"
> >
> > #include <subdev/timer.h>
> > @@ -156,6 +157,66 @@ gk110_gr_pack_mmio[] = {
> > {}
> > };
> >
> > +const struct nvkm_therm_clkgate_init
>
> These should all be static, no?
True, will send out a V3 in a moment
>
> > +gk110_clkgate_blcg_init_sked_0[] = {
> > + { 0x407000, 1, 0x00004041 },
> > + {}
> > +};
> > +
> > +const struct nvkm_therm_clkgate_init
> > +gk110_clkgate_blcg_init_gpc_gcc_0[] = {
> > + { 0x419020, 1, 0x00000042 },
> > + { 0x419038, 1, 0x00000042 },
> > + {}
> > +};
> > +
> > +const struct nvkm_therm_clkgate_init
> > +gk110_clkgate_blcg_init_gpc_l1c_0[] = {
> > + { 0x419cd4, 2, 0x00004042 },
> > + {}
> > +};
> > +
> > +const struct nvkm_therm_clkgate_init
> > +gk110_clkgate_blcg_init_gpc_mp_0[] = {
> > + { 0x419fd0, 1, 0x00004043 },
> > + { 0x419fd8, 1, 0x00004049 },
> > + { 0x419fe0, 2, 0x00004042 },
> > + { 0x419ff0, 1, 0x00000046 },
> > + { 0x419ff8, 1, 0x00004042 },
> > + { 0x419f90, 1, 0x00004042 },
> > + {}
> > +};
> > +
> > +const struct nvkm_therm_clkgate_pack
> > +gk110_clkgate_pack[] = {
> > + { gk104_clkgate_blcg_init_main_0 },
> > + { gk104_clkgate_blcg_init_rstr2d_0 },
> > + { gk104_clkgate_blcg_init_unk_0 },
> > + { gk104_clkgate_blcg_init_gcc_0 },
> > + { gk110_clkgate_blcg_init_sked_0 },
> > + { gk104_clkgate_blcg_init_unk_1 },
> > + { gk104_clkgate_blcg_init_gpc_ctxctl_0 },
> > + { gk104_clkgate_blcg_init_gpc_unk_0 },
> > + { gk104_clkgate_blcg_init_gpc_esetup_0 },
> > + { gk104_clkgate_blcg_init_gpc_tpbus_0 },
> > + { gk104_clkgate_blcg_init_gpc_zcull_0 },
> > + { gk104_clkgate_blcg_init_gpc_tpconf_0 },
> > + { gk104_clkgate_blcg_init_gpc_unk_1 },
> > + { gk110_clkgate_blcg_init_gpc_gcc_0 },
> > + { gk104_clkgate_blcg_init_gpc_ffb_0 },
> > + { gk104_clkgate_blcg_init_gpc_tex_0 },
> > + { gk104_clkgate_blcg_init_gpc_poly_0 },
> > + { gk110_clkgate_blcg_init_gpc_l1c_0 },
> > + { gk104_clkgate_blcg_init_gpc_unk_2 },
> > + { gk110_clkgate_blcg_init_gpc_mp_0 },
> > + { gk104_clkgate_blcg_init_gpc_ppc_0 },
> > + { gk104_clkgate_blcg_init_rop_zrop_0 },
> > + { gk104_clkgate_blcg_init_rop_0 },
> > + { gk104_clkgate_blcg_init_rop_crop_0 },
> > + { gk104_clkgate_blcg_init_pxbar_0 },
> > + {}
> > +};
> > +
> > /**************************************************************************
> > *****
> > * PGRAPH engine/subdev functions
> >
> > ****************************************************************************
> > **/
> > @@ -192,6 +253,7 @@ gk110_gr = {
> > .rops = gf100_gr_rops,
> > .ppc_nr = 2,
> > .grctx = &gk110_grctx,
> > + .clkgate_pack = gk110_clkgate_pack,
> > .sclass = {
> > { -1, -1, FERMI_TWOD_A },
> > { -1, -1, KEPLER_INLINE_TO_MEMORY_B },
> > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild
> > b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild
> > index 2571530e82f1..b4f22cce5d43 100644
> > --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild
> > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild
> > @@ -22,6 +22,7 @@ nvkm-y += nvkm/subdev/fb/mcp89.o
> > nvkm-y += nvkm/subdev/fb/gf100.o
> > nvkm-y += nvkm/subdev/fb/gf108.o
> > nvkm-y += nvkm/subdev/fb/gk104.o
> > +nvkm-y += nvkm/subdev/fb/gk110.o
> > nvkm-y += nvkm/subdev/fb/gk20a.o
> > nvkm-y += nvkm/subdev/fb/gm107.o
> > nvkm-y += nvkm/subdev/fb/gm200.o
> > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c
> > b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c
> > new file mode 100644
> > index 000000000000..5c8feef151a4
> > --- /dev/null
> > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c
> > @@ -0,0 +1,71 @@
> > +/*
> > + * Copyright 2017 Red Hat Inc.
> > + *
> > + * Permission is hereby granted, free of charge, to any person obtaining a
> > + * copy of this software and associated documentation files (the
> > "Software"),
> > + * to deal in the Software without restriction, including without
> > limitation
> > + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> > + * and/or sell copies of the Software, and to permit persons to whom the
> > + * Software is furnished to do so, subject to the following conditions:
> > + *
> > + * The above copyright notice and this permission notice shall be included
> > in
> > + * all copies or substantial portions of the Software.
> > + *
> > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
> > OR
> > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> > + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
> > + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> > + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> > + * OTHER DEALINGS IN THE SOFTWARE.
> > + *
> > + * Authors: Lyude Paul
> > + */
> > +#include "gf100.h"
> > +#include "gk104.h"
> > +#include "ram.h"
> > +#include <subdev/therm.h>
> > +#include <subdev/fb.h>
> > +
> > +/*
> > +
> > ****************************************************************************
> > ***
> > + * PGRAPH registers for clockgating
> > +
> > ****************************************************************************
> > ***
> > + */
> > +
> > +const struct nvkm_therm_clkgate_init
> > +gk110_fb_clkgate_blcg_init_unk_0[] = {
> > + { 0x100d10, 1, 0x0000c242 },
> > + { 0x100d30, 1, 0x0000c242 },
> > + { 0x100d3c, 1, 0x00000242 },
> > + { 0x100d48, 1, 0x0000c242 },
> > + { 0x100d1c, 1, 0x00000042 },
> > + {}
> > +};
> > +
> > +static const struct nvkm_therm_clkgate_pack
> > +gk110_fb_clkgate_pack[] = {
> > + { gk110_fb_clkgate_blcg_init_unk_0 },
> > + { gk104_fb_clkgate_blcg_init_vm_0 },
> > + { gk104_fb_clkgate_blcg_init_main_0 },
> > + { gk104_fb_clkgate_blcg_init_bcast_0 },
> > + {}
> > +};
> > +
> > +static const struct nvkm_fb_func
> > +gk110_fb = {
> > + .dtor = gf100_fb_dtor,
> > + .oneinit = gf100_fb_oneinit,
> > + .init = gf100_fb_init,
> > + .init_page = gf100_fb_init_page,
> > + .intr = gf100_fb_intr,
> > + .ram_new = gk104_ram_new,
> > + .default_bigpage = 17,
> > + .clkgate_pack = gk110_fb_clkgate_pack,
> > +};
> > +
> > +int
> > +gk110_fb_new(struct nvkm_device *device, int index, struct nvkm_fb **pfb)
> > +{
> > + return gf100_fb_new_(&gk110_fb, device, index, pfb);
> > +}
> > --
> > 2.14.3
> >
^ permalink raw reply [flat|nested] 9+ messages in thread
* [RFC v2 4/4] drm/nouveau: Add support for SLCG for Kepler2
2018-01-26 3:35 [RFC v2 0/4] Implement full clockgating for Kepler1 and 2 Lyude Paul
` (2 preceding siblings ...)
2018-01-26 3:35 ` [RFC v2 3/4] drm/nouveau: Add support for BLCG on Kepler2 Lyude Paul
@ 2018-01-26 3:35 ` Lyude Paul
3 siblings, 0 replies; 9+ messages in thread
From: Lyude Paul @ 2018-01-26 3:35 UTC (permalink / raw)
To: nouveau; +Cc: Ben Skeggs, David Airlie, dri-devel, linux-kernel
That's right, there's still more power saving to go! Starting with
kepler 2, nvidia hardware has an additional level of clockgating known
as second level clockgating. The details of this are not exact, but it
seems to work by waiting for a collection of dependent hardware blocks
to be gated before taking affect. As with the previous series, this
results in another noticeable drop in power consumption and is
programmed in the same manner.
Signed-off-by: Lyude Paul <lyude@redhat.com>
---
drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c | 93 ++++++++++++++++++++++++++
1 file changed, 93 insertions(+)
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
index 38d3328e45f1..5ded29c790dd 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
@@ -187,6 +187,87 @@ gk110_clkgate_blcg_init_gpc_mp_0[] = {
{}
};
+const struct nvkm_therm_clkgate_init
+gk110_clkgate_slcg_init_main_0[] = {
+ { 0x4041f4, 1, 0x00000000 },
+ { 0x409894, 1, 0x00000000 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk110_clkgate_slcg_init_unk_0[] = {
+ { 0x406004, 1, 0x00000000 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk110_clkgate_slcg_init_sked_0[] = {
+ { 0x407004, 1, 0x00000000 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk110_clkgate_slcg_init_gpc_ctxctl_0[] = {
+ { 0x41a894, 1, 0x00000000 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk110_clkgate_slcg_init_gpc_unk_0[] = {
+ { 0x418504, 1, 0x00000000 },
+ { 0x41860c, 1, 0x00000000 },
+ { 0x41868c, 1, 0x00000000 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk110_clkgate_slcg_init_gpc_esetup_0[] = {
+ { 0x41882c, 1, 0x00000000 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk110_clkgate_slcg_init_gpc_zcull_0[] = {
+ { 0x418974, 1, 0x00000000 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk110_clkgate_slcg_init_gpc_l1c_0[] = {
+ { 0x419cd8, 2, 0x00000000 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk110_clkgate_slcg_init_gpc_unk_1[] = {
+ { 0x419c74, 1, 0x00000000 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk110_clkgate_slcg_init_gpc_mp_0[] = {
+ { 0x419fd4, 1, 0x00004a4a },
+ { 0x419fdc, 1, 0x00000014 },
+ { 0x419fe4, 1, 0x00000000 },
+ { 0x419ff4, 1, 0x00001724 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk110_clkgate_slcg_init_gpc_ppc_0[] = {
+ { 0x41be2c, 1, 0x00000000 },
+ {}
+};
+
+const struct nvkm_therm_clkgate_init
+gk110_clkgate_slcg_init_pcounter_0[] = {
+ { 0x1be018, 1, 0x000001ff },
+ { 0x1bc018, 1, 0x000001ff },
+ { 0x1b8018, 1, 0x000001ff },
+ { 0x1b4124, 1, 0x00000000 },
+ {}
+};
+
const struct nvkm_therm_clkgate_pack
gk110_clkgate_pack[] = {
{ gk104_clkgate_blcg_init_main_0 },
@@ -214,6 +295,18 @@ gk110_clkgate_pack[] = {
{ gk104_clkgate_blcg_init_rop_0 },
{ gk104_clkgate_blcg_init_rop_crop_0 },
{ gk104_clkgate_blcg_init_pxbar_0 },
+ { gk110_clkgate_slcg_init_main_0 },
+ { gk110_clkgate_slcg_init_unk_0 },
+ { gk110_clkgate_slcg_init_sked_0 },
+ { gk110_clkgate_slcg_init_gpc_ctxctl_0 },
+ { gk110_clkgate_slcg_init_gpc_unk_0 },
+ { gk110_clkgate_slcg_init_gpc_esetup_0 },
+ { gk110_clkgate_slcg_init_gpc_zcull_0 },
+ { gk110_clkgate_slcg_init_gpc_l1c_0 },
+ { gk110_clkgate_slcg_init_gpc_unk_1 },
+ { gk110_clkgate_slcg_init_gpc_mp_0 },
+ { gk110_clkgate_slcg_init_gpc_ppc_0 },
+ { gk110_clkgate_slcg_init_pcounter_0 },
{}
};
--
2.14.3
^ permalink raw reply related [flat|nested] 9+ messages in thread