Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3265637 authored by Rhys Kidd's avatar Rhys Kidd Committed by Ben Skeggs
Browse files

drm/nouveau/therm/gp100: initial implementation of new gp1xx temperature sensor 



v2:
 - add nv138 and drop nv13b chipsets (Ilia Mirkin)
 - refactor out status variable and instead mask tsensor (Ilia Mirkin)
 - switch SHADOWed state message away from nvkm_error() (Ilia Mirkin)
 - rename internal temperature variable (Karol Herbst)

v3:
 - use nvkm_trace() for SHADOWed state message (Ben Skeggs)

Signed-off-by: default avatarRhys Kidd <rhyskidd@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 7a88cbd8

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

+1 −0
Original line number Diff line number Diff line
@@ -97,4 +97,5 @@ 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 **);

int gp100_therm_new(struct nvkm_device *, int, struct nvkm_therm **);

#endif

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

+6 −0
Original line number Diff line number Diff line
@@ -2169,6 +2169,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,
@@ -2203,6 +2204,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,
@@ -2237,6 +2239,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,
@@ -2271,6 +2274,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,
@@ -2305,6 +2309,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,
@@ -2339,6 +2344,7 @@ nv138_chipset = { 
	.ltc = gp100_ltc_new,

	.mc = gp100_mc_new,

	.mmu = gf100_mmu_new,

	.therm = gp100_therm_new,

	.pci = gp100_pci_new,

	.pmu = gp102_pmu_new,

	.timer = gk20a_timer_new,

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

+1 −0
Original line number Diff line number Diff line
@@ -12,3 +12,4 @@ 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

nvkm-y += nvkm/subdev/therm/gp100.o

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

+2 −1
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ nvkm_therm_init(struct nvkm_subdev *subdev) 
{

	struct nvkm_therm *therm = nvkm_therm(subdev);



	if (therm->func->init)

		therm->func->init(therm);



	if (therm->suspend >= 0) {

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

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

 * 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 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: Rhys Kidd

 */

#include "priv.h"



static int

gp100_temp_get(struct nvkm_therm *therm)

{

	struct nvkm_device *device = therm->subdev.device;

	struct nvkm_subdev *subdev = &therm->subdev;

	u32 tsensor = nvkm_rd32(device, 0x020460);

	u32 inttemp = (tsensor & 0x0001fff8);



	/* device SHADOWed */

	if (tsensor & 0x40000000)

		nvkm_trace(subdev, "reading temperature from SHADOWed sensor\n");



	/* device valid */

	if (tsensor & 0x20000000)

		return (inttemp >> 8);

	else

		return -ENODEV;

}



static const struct nvkm_therm_func

gp100_therm = {

	.temp_get = gp100_temp_get,

	.program_alarms = nvkm_therm_program_alarms_polling,

};



int

gp100_therm_new(struct nvkm_device *device, int index,

		struct nvkm_therm **ptherm)

{

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

}