On Mon, 14 Jan 2019 at 08:50, Ilia Mirkin <imirkin@xxxxxxxxxxxx> wrote: > > GF117 appears to use the same register as GK104 (but still with the > general Fermi readout mechanism). > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108980 > Signed-off-by: Ilia Mirkin <imirkin@xxxxxxxxxxxx> > --- > > v1 -> v2: split out different regid into separate file. Merged. Thanks! > > .../drm/nouveau/include/nvkm/subdev/volt.h | 1 + > .../gpu/drm/nouveau/nvkm/engine/device/base.c | 2 +- > .../gpu/drm/nouveau/nvkm/subdev/volt/Kbuild | 1 + > .../gpu/drm/nouveau/nvkm/subdev/volt/gf117.c | 60 +++++++++++++++++++ > 4 files changed, 63 insertions(+), 1 deletion(-) > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/volt/gf117.c > > diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h > index 8a0f85f5fc1a..6a765682fbfa 100644 > --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h > +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h > @@ -38,6 +38,7 @@ int nvkm_volt_set_id(struct nvkm_volt *, u8 id, u8 min_id, u8 temp, > > int nv40_volt_new(struct nvkm_device *, int, struct nvkm_volt **); > int gf100_volt_new(struct nvkm_device *, int, struct nvkm_volt **); > +int gf117_volt_new(struct nvkm_device *, int, struct nvkm_volt **); > int gk104_volt_new(struct nvkm_device *, int, struct nvkm_volt **); > int gk20a_volt_new(struct nvkm_device *, int, struct nvkm_volt **); > int gm20b_volt_new(struct nvkm_device *, int, struct nvkm_volt **); > diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c > index e294013426ce..347a6a4cb339 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c > +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c > @@ -1613,7 +1613,7 @@ nvd7_chipset = { > .pci = gf106_pci_new, > .therm = gf119_therm_new, > .timer = nv41_timer_new, > - .volt = gf100_volt_new, > + .volt = gf117_volt_new, > .ce[0] = gf100_ce_new, > .disp = gf119_disp_new, > .dma = gf119_dma_new, > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/volt/Kbuild b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/Kbuild > index bcd179ba11d0..146adcdd316a 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/subdev/volt/Kbuild > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/Kbuild > @@ -2,6 +2,7 @@ nvkm-y += nvkm/subdev/volt/base.o > nvkm-y += nvkm/subdev/volt/gpio.o > nvkm-y += nvkm/subdev/volt/nv40.o > nvkm-y += nvkm/subdev/volt/gf100.o > +nvkm-y += nvkm/subdev/volt/gf117.o > nvkm-y += nvkm/subdev/volt/gk104.o > nvkm-y += nvkm/subdev/volt/gk20a.o > nvkm-y += nvkm/subdev/volt/gm20b.o > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gf117.c b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gf117.c > new file mode 100644 > index 000000000000..547a58f0aeac > --- /dev/null > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gf117.c > @@ -0,0 +1,60 @@ > +/* > + * Copyright 2019 Ilia Mirkin > + * > + * 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: Ilia Mirkin > + */ > +#include "priv.h" > + > +#include <subdev/fuse.h> > + > +static int > +gf117_volt_speedo_read(struct nvkm_volt *volt) > +{ > + struct nvkm_device *device = volt->subdev.device; > + struct nvkm_fuse *fuse = device->fuse; > + > + if (!fuse) > + return -EINVAL; > + > + return nvkm_fuse_read(fuse, 0x3a8); > +} > + > +static const struct nvkm_volt_func > +gf117_volt = { > + .oneinit = gf100_volt_oneinit, > + .vid_get = nvkm_voltgpio_get, > + .vid_set = nvkm_voltgpio_set, > + .speedo_read = gf117_volt_speedo_read, > +}; > + > +int > +gf117_volt_new(struct nvkm_device *device, int index, struct nvkm_volt **pvolt) > +{ > + struct nvkm_volt *volt; > + int ret; > + > + ret = nvkm_volt_new_(&gf117_volt, device, index, &volt); > + *pvolt = volt; > + if (ret) > + return ret; > + > + return nvkm_voltgpio_init(volt); > +} > -- > 2.19.2 > > _______________________________________________ > Nouveau mailing list > Nouveau@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/nouveau _______________________________________________ Nouveau mailing list Nouveau@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/nouveau
