diff options
author | Lucas Stach <l.stach@pengutronix.de> | 2017-08-08 09:28:25 -0400 |
---|---|---|
committer | Lucas Stach <l.stach@pengutronix.de> | 2017-08-15 09:28:15 -0400 |
commit | 5247e2aac5c932e6d59af7715854d1bb47ebdf89 (patch) | |
tree | 1dfc885f0eea2ab024802b31498b60134559e51f | |
parent | 23d1dd03cc51e2570045745c7a24ef0f45141558 (diff) |
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: Lucas Stach <l.stach@pengutronix.de>
-rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index ada45fdd0eae..fc9a6a83dfc7 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c | |||
@@ -1622,10 +1622,12 @@ static int etnaviv_gpu_bind(struct device *dev, struct device *master, | |||
1622 | struct etnaviv_gpu *gpu = dev_get_drvdata(dev); | 1622 | struct etnaviv_gpu *gpu = dev_get_drvdata(dev); |
1623 | int ret; | 1623 | int ret; |
1624 | 1624 | ||
1625 | gpu->cooling = thermal_of_cooling_device_register(dev->of_node, | 1625 | if (IS_ENABLED(CONFIG_THERMAL)) { |
1626 | gpu->cooling = thermal_of_cooling_device_register(dev->of_node, | ||
1626 | (char *)dev_name(dev), gpu, &cooling_ops); | 1627 | (char *)dev_name(dev), gpu, &cooling_ops); |
1627 | if (IS_ERR(gpu->cooling)) | 1628 | if (IS_ERR(gpu->cooling)) |
1628 | return PTR_ERR(gpu->cooling); | 1629 | return PTR_ERR(gpu->cooling); |
1630 | } | ||
1629 | 1631 | ||
1630 | #ifdef CONFIG_PM | 1632 | #ifdef CONFIG_PM |
1631 | ret = pm_runtime_get_sync(gpu->dev); | 1633 | ret = pm_runtime_get_sync(gpu->dev); |