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

Commit 5247e2aa authored by Lucas Stach's avatar Lucas Stach
Browse files

drm/etnaviv: don't fail GPU bind when CONFIG_THERMAL isn't enabled 



The stub functions returns -ENODEV when trying to register the cooling device,
thus failing the GPU bind, rendering the GPU subsystem unusable when
CONFIG_THERMAL isn't enabled.

Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
parent 23d1dd03

drivers/gpu/drm/etnaviv/etnaviv_gpu.c

+5 −3
Original line number Diff line number Diff line
@@ -1622,10 +1622,12 @@ static int etnaviv_gpu_bind(struct device *dev, struct device *master, 
	struct etnaviv_gpu *gpu = dev_get_drvdata(dev);

	int ret;



	if (IS_ENABLED(CONFIG_THERMAL)) {

		gpu->cooling = thermal_of_cooling_device_register(dev->of_node,

				(char *)dev_name(dev), gpu, &cooling_ops);

		if (IS_ERR(gpu->cooling))

			return PTR_ERR(gpu->cooling);

	}



#ifdef CONFIG_PM

	ret = pm_runtime_get_sync(gpu->dev);