Implement full clockgating for Kepler1 and 2
Subsystems (3)
Lyude Paul
maintainerv4 cover Implement full clockgating for Kepler1 and 2
Next version of my patchseries for adding clockgating support for kepler1 and 2 on nouveau. The first version of this series can be found here:
https://patchwork.freedesktop.org/series/36504/
One small change:
- Set therm->clkgate_enabled to false until the last patch, where we introduce the NvPmEnableGating option
Lyude Paul (5):
drm/nouveau: Add support for basic clockgating on Kepler1 drm/nouveau: Add support for BLCG on Kepler1 drm/nouveau: Add support for BLCG on Kepler2 drm/nouveau: Add support for SLCG for Kepler2 drm/nouveau: Introduce NvPmEnableGating option
drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | 1 + .../gpu/drm/nouveau/include/nvkm/subdev/therm.h | 17 ++ drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 25 +-- 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/engine/gr/gk110.c | 155 +++++++++++++++ drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild | 1 + 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/gk110.c | 71 +++++++ drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h | 2 + drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild | 2 + drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c | 70 ++++++- drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.c | 75 ++++++++ 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 | 136 ++++++++++++++ drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.h | 48 +++++ drivers/gpu/drm/nouveau/nvkm/subdev/therm/gt215.c | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h | 23 ++- 22 files changed, 996 insertions(+), 26 deletions(-) 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/fb/gk110.c create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.c 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
Signature · 6 lines
2.14.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Lyude Paul
maintainerRFC v4 1/5 drm/nouveau: Add support for basic clockgating on Kepler1
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
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.
--- .../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 | 58 +++++++-- 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, 301 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
drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h +5 -0
@@ -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 **);
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +10 -7
@@ -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);
drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild +1 -0
@@ -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
drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c +50 -8
88 lines not on this page · raw message
drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.h new file +35 -0
@@ -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
drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf119.c +4 -4
@@ -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;
drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c new file +135 -0
135 lines not on this page · raw message
drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.h new file +48 -0
48 lines not on this page · raw message
drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h +13 -2
@@ -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 *);
Signature · 6 lines
2.14.3 _______________________________________________ Nouveau mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/nouveau
Lyude Paul
maintainerRFC v4 2/5 drm/nouveau: Add support for BLCG on Kepler1
In reply to Lyude PaulThis 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.
--- .../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 | 75 ++++++++ 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, 461 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
drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h +12 -0
@@ -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 );
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h +1 -0
@@ -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[]; };
drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c +207 -0
231 lines not on this page · raw message
drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.h new file +55 -0
55 lines not on this page · raw message
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c +6 -0
@@ -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 *
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c +47 -0
63 lines not on this page · raw message
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.h new file +35 -0
@@ -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
drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h +2 -0
@@ -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,
drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild +1 -0
@@ -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
drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c +10 -0
@@ -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) {
drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.c new file +75 -0
75 lines not on this page · raw message
drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c +1 -0
@@ -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, };
drivers/gpu/drm/nouveau/nvkm/subdev/therm/gt215.c +1 -1
@@ -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;
drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h +8 -0
@@ -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 );
Signature · 6 lines
2.14.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Lyude Paul
maintainerRFC v4 3/5 drm/nouveau: Add support for BLCG on Kepler2
In reply to Lyude PaulSame as the previous patch, but for Kepler2 now
--- 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
drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h +1 -0
@@ -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 **);
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +4 -4
@@ -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,
drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c +62 -0
80 lines not on this page · raw message
drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild +1 -0
@@ -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
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c new file +71 -0
71 lines not on this page · raw message
Signature · 1 line
2.14.3
Lyude Paul
maintainerRFC v4 4/5 drm/nouveau: Add support for SLCG for Kepler2
In reply to Lyude PaulThat'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.
--- drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c | 93 ++++++++++++++++++++++++++ 1 file changed, 93 insertions(+)
drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c +93 -0
@@ -187,6 +187,87 @@ gk110_clkgate_blcg_init_gpc_mp_0[] = { {} }; +static const struct nvkm_therm_clkgate_init +gk110_clkgate_slcg_init_main_0[] = { + {0x4041f4 ,1 ,0x00000000 }, + {0x409894 ,1 ,0x00000000 }, + {} +}; + +static const struct nvkm_therm_clkgate_init +gk110_clkgate_slcg_init_unk_0[] = { + {0x406004 ,1 ,0x00000000 }, + {} +}; + +static const struct nvkm_therm_clkgate_init +gk110_clkgate_slcg_init_sked_0[] = { + {0x407004 ,1 ,0x00000000 }, + {} +}; + +static const struct nvkm_therm_clkgate_init +gk110_clkgate_slcg_init_gpc_ctxctl_0[] = { + {0x41a894 ,1 ,0x00000000 }, + {} +}; + +static const struct nvkm_therm_clkgate_init +gk110_clkgate_slcg_init_gpc_unk_0[] = { + {0x418504 ,1 ,0x00000000 }, + {0x41860c ,1 ,0x00000000 }, + {0x41868c ,1 ,0x00000000 }, + {} +}; + +static const struct nvkm_therm_clkgate_init +gk110_clkgate_slcg_init_gpc_esetup_0[] = { + {0x41882c ,1 ,0x00000000 }, + {} +}; + +static const struct nvkm_therm_clkgate_init +gk110_clkgate_slcg_init_gpc_zcull_0[] = { + {0x418974 ,1 ,0x00000000 }, + {} +}; + +static const struct nvkm_therm_clkgate_init +gk110_clkgate_slcg_init_gpc_l1c_0[] = { + {0x419cd8 ,2 ,0x00000000 }, + {} +}; + +static const struct nvkm_therm_clkgate_init +gk110_clkgate_slcg_init_gpc_unk_1[] = { + {0x419c74 ,1 ,0x00000000 }, + {} +}; + +static 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 }, + {} +}; + +static const struct nvkm_therm_clkgate_init +gk110_clkgate_slcg_init_gpc_ppc_0[] = { + {0x41be2c ,1 ,0x00000000 }, + {} +}; + +static const struct nvkm_therm_clkgate_init +gk110_clkgate_slcg_init_pcounter_0[] = { + {0x1be018 ,1 ,0x000001ff }, + {0x1bc018 ,1 ,0x000001ff }, + {0x1b8018 ,1 ,0x000001ff }, + {0x1b4124 ,1 ,0x00000000 }, + {} +}; +static 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 }, {} };
Signature · 1 line
2.14.3
Lyude Paul
maintainerRFC v4 5/5 drm/nouveau: Introduce NvPmEnableGating option
In reply to Lyude PaulThis adds the NvPmEnableGating config option to nouveau, which can be used to enable or disable clockgating for supported chipsets. Enabling can be done by passing
config=NvPmEnableGating=1
To nouveau. If your chipset supports it, you'll see a message in your kernel log indicating that clockgating is enabled. Since clockgating has only had limited testing thus far, we leave this option disabled by default for now.
--- drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c +3 -1
@@ -434,7 +434,9 @@ nvkm_therm_ctor(struct nvkm_therm *therm, 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 = false; + + therm->clkgating_enabled =nvkm_boolopt (device->cfgopt, +"NvPmEnableGating" , false); }int
Signature · 6 lines
2.14.3 _______________________________________________ Nouveau mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/nouveau