Commit 9d60b9c9 authored by Karol Herbst's avatar Karol Herbst Committed by Ben Skeggs
Browse files

drm/nouveau/therm/gm200: Added 



This allows temperature readouts on maxwell2 GPUs.

Signed-off-by: default avatarKarol Herbst <karolherbst@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 4a84a6fd

drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h

+1 −0
Original line number Diff line number Diff line
@@ -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 gm200_therm_new(struct nvkm_device *, int, struct nvkm_therm **);

#endif

drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

+3 −0
Original line number Diff line number Diff line
@@ -2043,6 +2043,7 @@ nv120_chipset = { 
	.mxm = nv50_mxm_new,

	.pci = gk104_pci_new,

	.pmu = gm107_pmu_new,

	.therm = gm200_therm_new,

	.secboot = gm200_secboot_new,

	.timer = gk20a_timer_new,

	.top = gk104_top_new,
@@ -2077,6 +2078,7 @@ nv124_chipset = { 
	.mxm = nv50_mxm_new,

	.pci = gk104_pci_new,

	.pmu = gm107_pmu_new,

	.therm = gm200_therm_new,

	.secboot = gm200_secboot_new,

	.timer = gk20a_timer_new,

	.top = gk104_top_new,
@@ -2111,6 +2113,7 @@ nv126_chipset = { 
	.mxm = nv50_mxm_new,

	.pci = gk104_pci_new,

	.pmu = gm107_pmu_new,

	.therm = gm200_therm_new,

	.secboot = gm200_secboot_new,

	.timer = gk20a_timer_new,

	.top = gk104_top_new,

drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -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/gm200.o

drivers/gpu/drm/nouveau/nvkm/subdev/therm/g84.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ g84_therm_fini(struct nvkm_therm *therm) 
	nvkm_wr32(device, 0x1100, 0x10000); /* PBUS */

}



static void

void

g84_therm_init(struct nvkm_therm *therm)

{

	g84_sensor_setup(therm);

drivers/gpu/drm/nouveau/nvkm/subdev/therm/gm200.c

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2017 Karol Herbst

 *

 * 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: Karol Herbst

 */

#include "priv.h"



static const struct nvkm_therm_func

gm200_therm = {

	.init = g84_therm_init,

	.fini = g84_therm_fini,

	.temp_get = g84_temp_get,

	.program_alarms = nvkm_therm_program_alarms_polling,

};



int

gm200_therm_new(struct nvkm_device *device, int index,

		struct nvkm_therm **ptherm)

{

	return nvkm_therm_new_(&gm200_therm, device, index, ptherm);

}