Re: [Nouveau] [RFC PATCH] drm/nouveau/therm: initial implementation of new gp1xx temperature sensor
On Thu, Aug 31, 2017 at 4:55 AM, Rhys Kiddwrote: > Signed-off-by: Rhys Kidd > --- > .../gpu/drm/nouveau/include/nvkm/subdev/therm.h| 1 + > drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 6 +++ > drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild | 1 + > drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c | 3 +- > drivers/gpu/drm/nouveau/nvkm/subdev/therm/gp100.c | 57 > ++ > 5 files changed, 67 insertions(+), 1 deletion(-) > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/therm/gp100.c > > diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h > b/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h > index b268b96faece..adf14731ea15 100644 > --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h > +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h > @@ -96,4 +96,5 @@ 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 gm107_therm_new(struct nvkm_device *, int, struct nvkm_therm **); > +int gp100_therm_new(struct nvkm_device *, int, struct nvkm_therm **); > #endif > diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c > b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c > index 7bdc7a5ae723..a6221b0996bf 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c > +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c > @@ -2166,6 +2166,7 @@ nv130_chipset = { > .ltc = gp100_ltc_new, > .mc = gp100_mc_new, > .mmu = gf100_mmu_new, > + .therm = gp100_therm_new, > .secboot = gm200_secboot_new, > .pci = gp100_pci_new, > .pmu = gp100_pmu_new, > @@ -2200,6 +2201,7 @@ nv132_chipset = { > .ltc = gp100_ltc_new, > .mc = gp100_mc_new, > .mmu = gf100_mmu_new, > + .therm = gp100_therm_new, > .secboot = gp102_secboot_new, > .pci = gp100_pci_new, > .pmu = gp102_pmu_new, > @@ -2234,6 +2236,7 @@ nv134_chipset = { > .ltc = gp100_ltc_new, > .mc = gp100_mc_new, > .mmu = gf100_mmu_new, > + .therm = gp100_therm_new, > .secboot = gp102_secboot_new, > .pci = gp100_pci_new, > .pmu = gp102_pmu_new, > @@ -2268,6 +2271,7 @@ nv136_chipset = { > .ltc = gp100_ltc_new, > .mc = gp100_mc_new, > .mmu = gf100_mmu_new, > + .therm = gp100_therm_new, > .secboot = gp102_secboot_new, > .pci = gp100_pci_new, > .pmu = gp102_pmu_new, > @@ -2302,6 +2306,7 @@ nv137_chipset = { > .ltc = gp100_ltc_new, > .mc = gp100_mc_new, > .mmu = gf100_mmu_new, > + .therm = gp100_therm_new, > .secboot = gp102_secboot_new, > .pci = gp100_pci_new, > .pmu = gp102_pmu_new, > @@ -2332,6 +2337,7 @@ nv13b_chipset = { > .ltc = gp100_ltc_new, > .mc = gp10b_mc_new, > .mmu = gf100_mmu_new, > + .therm = gp100_therm_new, > .secboot = gp10b_secboot_new, > .pmu = gm20b_pmu_new, > .timer = gk20a_timer_new, > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild > b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild > index 135758ba3e28..3ef1b396a946 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild > @@ -11,3 +11,4 @@ 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/gm107.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 952a7cb0a59a..f27fc6d0d4c6 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c > @@ -341,7 +341,8 @@ nvkm_therm_init(struct nvkm_subdev *subdev) > { > struct nvkm_therm *therm = nvkm_therm(subdev); > > - therm->func->init(therm); > + if (therm->func->init) > + therm->func->init(therm); > > if (therm->suspend >= 0) { > /* restore the pwm value only when on manual or auto mode */ > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gp100.c > b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gp100.c > new file mode 100644 > index ..b83d4af8c8bb > --- /dev/null > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gp100.c > @@ -0,0 +1,57 @@ > +/* > + * Copyright 2017 Rhys Kidd > + * > + * 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
Re: [Nouveau] [RFC PATCH] drm/nouveau/therm: initial implementation of new gp1xx temperature sensor
On Wed, Aug 30, 2017 at 10:55 PM, Rhys Kiddwrote: > Signed-off-by: Rhys Kidd > --- > .../gpu/drm/nouveau/include/nvkm/subdev/therm.h| 1 + > drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 6 +++ > drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild | 1 + > drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c | 3 +- > drivers/gpu/drm/nouveau/nvkm/subdev/therm/gp100.c | 57 > ++ > 5 files changed, 67 insertions(+), 1 deletion(-) > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/therm/gp100.c > > diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h > b/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h > index b268b96faece..adf14731ea15 100644 > --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h > +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h > @@ -96,4 +96,5 @@ 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 gm107_therm_new(struct nvkm_device *, int, struct nvkm_therm **); > +int gp100_therm_new(struct nvkm_device *, int, struct nvkm_therm **); > #endif > diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c > b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c > index 7bdc7a5ae723..a6221b0996bf 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c > +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c > @@ -2166,6 +2166,7 @@ nv130_chipset = { > .ltc = gp100_ltc_new, > .mc = gp100_mc_new, > .mmu = gf100_mmu_new, > + .therm = gp100_therm_new, > .secboot = gm200_secboot_new, > .pci = gp100_pci_new, > .pmu = gp100_pmu_new, > @@ -2200,6 +2201,7 @@ nv132_chipset = { > .ltc = gp100_ltc_new, > .mc = gp100_mc_new, > .mmu = gf100_mmu_new, > + .therm = gp100_therm_new, > .secboot = gp102_secboot_new, > .pci = gp100_pci_new, > .pmu = gp102_pmu_new, > @@ -2234,6 +2236,7 @@ nv134_chipset = { > .ltc = gp100_ltc_new, > .mc = gp100_mc_new, > .mmu = gf100_mmu_new, > + .therm = gp100_therm_new, > .secboot = gp102_secboot_new, > .pci = gp100_pci_new, > .pmu = gp102_pmu_new, > @@ -2268,6 +2271,7 @@ nv136_chipset = { > .ltc = gp100_ltc_new, > .mc = gp100_mc_new, > .mmu = gf100_mmu_new, > + .therm = gp100_therm_new, > .secboot = gp102_secboot_new, > .pci = gp100_pci_new, > .pmu = gp102_pmu_new, > @@ -2302,6 +2306,7 @@ nv137_chipset = { > .ltc = gp100_ltc_new, > .mc = gp100_mc_new, > .mmu = gf100_mmu_new, > + .therm = gp100_therm_new, > .secboot = gp102_secboot_new, > .pci = gp100_pci_new, > .pmu = gp102_pmu_new, Why not add it to nv138_chipset? > @@ -2332,6 +2337,7 @@ nv13b_chipset = { > .ltc = gp100_ltc_new, > .mc = gp10b_mc_new, > .mmu = gf100_mmu_new, > + .therm = gp100_therm_new, GK20A and GM20B both don't have therm. I'm guessing this shouldn't either. > .secboot = gp10b_secboot_new, > .pmu = gm20b_pmu_new, > .timer = gk20a_timer_new, > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild > b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild > index 135758ba3e28..3ef1b396a946 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild > @@ -11,3 +11,4 @@ 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/gm107.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 952a7cb0a59a..f27fc6d0d4c6 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c > @@ -341,7 +341,8 @@ nvkm_therm_init(struct nvkm_subdev *subdev) > { > struct nvkm_therm *therm = nvkm_therm(subdev); > > - therm->func->init(therm); > + if (therm->func->init) > + therm->func->init(therm); > > if (therm->suspend >= 0) { > /* restore the pwm value only when on manual or auto mode */ > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gp100.c > b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gp100.c > new file mode 100644 > index ..b83d4af8c8bb > --- /dev/null > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gp100.c > @@ -0,0 +1,57 @@ > +/* > + * Copyright 2017 Rhys Kidd > + * > + * 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