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

Commit 92256269 authored by Thierry Reding's avatar Thierry Reding Committed by Ben Skeggs
Browse files

drm/nouveau: Make clock gate support conditional 



The recently introduced clock gate support breaks on Tegra chips because
no thermal support is enabled for those devices. Conditionalize the code
on the existence of thermal support to fix this.

Fixes: b138eca6 ("drm/nouveau: Add support for basic clockgating on Kepler1")
Cc: Martin Peres <martin.peres@free.fr>
Cc: Lyude Paul <lyude@redhat.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent b515483e

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

+3 −3
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ nvkm_therm_attr_set(struct nvkm_therm *therm, 
void

nvkm_therm_clkgate_enable(struct nvkm_therm *therm)

{

	if (!therm->func->clkgate_enable || !therm->clkgating_enabled)

	if (!therm || !therm->func->clkgate_enable || !therm->clkgating_enabled)

		return;



	nvkm_debug(&therm->subdev,
@@ -312,7 +312,7 @@ nvkm_therm_clkgate_enable(struct nvkm_therm *therm) 
void

nvkm_therm_clkgate_fini(struct nvkm_therm *therm, bool suspend)

{

	if (!therm->func->clkgate_fini || !therm->clkgating_enabled)

	if (!therm || !therm->func->clkgate_fini || !therm->clkgating_enabled)

		return;



	nvkm_debug(&therm->subdev,
@@ -395,7 +395,7 @@ void 
nvkm_therm_clkgate_init(struct nvkm_therm *therm,

			const struct nvkm_therm_clkgate_pack *p)

{

	if (!therm->func->clkgate_init || !therm->clkgating_enabled)

	if (!therm || !therm->func->clkgate_init || !therm->clkgating_enabled)

		return;



	therm->func->clkgate_init(therm, p);