drm/nouveau/gpio: check the gpio function 16 in the power check as well

Added GPIO is "Thermal and External Power Detect". It's uncertain if this
GPIO is set on GPU initialization or only if a change is detected by the
GPU at runtime.

This GPIO can be found in Rankine and Curie and rarely on Tesla GPUs
VBIOS.

Untested, wrote according to documentation.

Signed-off-by: Mark Menzynski <mmenzyns@redhat.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/gpio.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/gpio.h
index d036cdc45201082e27b86431afff8d7544cbf3b4..f454bbd29a7a99725dc66119228f88efeaa3c343 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/gpio.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/gpio.h
@@ -5,6 +5,7 @@ enum dcb_gpio_func_name {
        DCB_GPIO_PANEL_POWER = 0x01,
        DCB_GPIO_FAN = 0x09,
        DCB_GPIO_TVDAC0 = 0x0c,
+       DCB_GPIO_THERM_EXT_POWER_EVENT = 0x10,
        DCB_GPIO_TVDAC1 = 0x2d,
        DCB_GPIO_FAN_SENSE = 0x3d,
        DCB_GPIO_EXT_POWER_LOW = 0x79,

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c
index 1337a110c0e3aaa3c7ded9dc998f0d9ebf8e6c59..2aa809ce7ff39d6d980dc22a7d011d8e3579efb3 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c
@@ -184,6 +184,7 @@ static const struct dmi_system_id gpio_reset_ids[] = {
 };
 
 static enum dcb_gpio_func_name power_checks[] = {
+       DCB_GPIO_THERM_EXT_POWER_EVENT,
        DCB_GPIO_EXT_POWER_LOW,
 };