Commit 09b8d73b authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nvc0/therm: allow fan control if we've killed the vbios ppwr ucode 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 36faa2fc

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

+4 −3
Original line number Original line Diff line number Diff line
@@ -168,14 +168,15 @@ nouveau_therm_fan_mode(struct nouveau_therm *therm, int mode) 
		"automatic"

		"automatic"

	};

	};





	/* The default PDAEMON ucode interferes with fan management */

	/* The default PPWR ucode on fermi interferes with fan management */

	if ((mode >= ARRAY_SIZE(name)) ||

	if ((mode >= ARRAY_SIZE(name)) ||

	    (mode != NOUVEAU_THERM_CTRL_NONE && device->card_type >= NV_C0))

	    (mode != NOUVEAU_THERM_CTRL_NONE && device->card_type >= NV_C0 &&

	     !nouveau_subdev(device, NVDEV_SUBDEV_PWR)))

		return -EINVAL;

		return -EINVAL;





	/* do not allow automatic fan management if the thermal sensor is

	/* do not allow automatic fan management if the thermal sensor is

	 * not available */

	 * not available */

	if (priv->mode == 2 && therm->temp_get(therm) < 0)

	if (priv->mode == NOUVEAU_THERM_CTRL_AUTO && therm->temp_get(therm) < 0)

		return -EINVAL;

		return -EINVAL;





	if (priv->mode == mode)

	if (priv->mode == mode)