raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

drm/nouveau: platform: Fix deferred probe

Browse Source 
commit 870571a569 upstream.

The error cleanup paths aren't quite correct and will crash upon
deferred probe.

Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Thierry Reding
2016-02-24 18:34:43 +01:00
committed by Greg Kroah-Hartman
parent 2168fe3d7b
commit 4323b4dbfc
2 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/nouveau_platform.c
View File

@@ -24,7 +24,7 @@
static int nouveau_platform_probe(struct platform_device *pdev) static int nouveau_platform_probe(struct platform_device *pdev)
{ {
const struct nvkm_device_tegra_func *func; const struct nvkm_device_tegra_func *func;
struct nvkm_device *device; struct nvkm_device *device = NULL;
struct drm_device *drm; struct drm_device *drm;
int ret; int ret;

40
drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
View File

@@ -252,32 +252,40 @@ nvkm_device_tegra_new(const struct nvkm_device_tegra_func *func,
if (!(tdev = kzalloc(sizeof(*tdev), GFP_KERNEL))) if (!(tdev = kzalloc(sizeof(*tdev), GFP_KERNEL)))
return -ENOMEM; return -ENOMEM;
*pdevice = &tdev->device;
tdev->func = func; tdev->func = func;
tdev->pdev = pdev; tdev->pdev = pdev;
tdev->irq = -1; tdev->irq = -1;
tdev->vdd = devm_regulator_get(&pdev->dev, "vdd"); tdev->vdd = devm_regulator_get(&pdev->dev, "vdd");
if (IS_ERR(tdev->vdd)) if (IS_ERR(tdev->vdd)) {
return PTR_ERR(tdev->vdd); ret = PTR_ERR(tdev->vdd);
goto free;
}
tdev->rst = devm_reset_control_get(&pdev->dev, "gpu"); tdev->rst = devm_reset_control_get(&pdev->dev, "gpu");
if (IS_ERR(tdev->rst)) if (IS_ERR(tdev->rst)) {
return PTR_ERR(tdev->rst); ret = PTR_ERR(tdev->rst);
goto free;
}
tdev->clk = devm_clk_get(&pdev->dev, "gpu"); tdev->clk = devm_clk_get(&pdev->dev, "gpu");
if (IS_ERR(tdev->clk)) if (IS_ERR(tdev->clk)) {
return PTR_ERR(tdev->clk); ret = PTR_ERR(tdev->clk);
goto free;
}
tdev->clk_pwr = devm_clk_get(&pdev->dev, "pwr"); tdev->clk_pwr = devm_clk_get(&pdev->dev, "pwr");
if (IS_ERR(tdev->clk_pwr)) if (IS_ERR(tdev->clk_pwr)) {
return PTR_ERR(tdev->clk_pwr); ret = PTR_ERR(tdev->clk_pwr);
goto free;
}
nvkm_device_tegra_probe_iommu(tdev); nvkm_device_tegra_probe_iommu(tdev);
ret = nvkm_device_tegra_power_up(tdev); ret = nvkm_device_tegra_power_up(tdev);
if (ret) if (ret)
return ret; goto remove;
tdev->gpu_speedo = tegra_sku_info.gpu_speedo_value; tdev->gpu_speedo = tegra_sku_info.gpu_speedo_value;
ret = nvkm_device_ctor(&nvkm_device_tegra_func, NULL, &pdev->dev, ret = nvkm_device_ctor(&nvkm_device_tegra_func, NULL, &pdev->dev,
@@ -285,9 +293,19 @@ nvkm_device_tegra_new(const struct nvkm_device_tegra_func *func,
cfg, dbg, detect, mmio, subdev_mask, cfg, dbg, detect, mmio, subdev_mask,
&tdev->device); &tdev->device);
if (ret) if (ret)
return ret; goto powerdown;
*pdevice = &tdev->device;
return 0; return 0;
powerdown:
nvkm_device_tegra_power_down(tdev);
remove:
nvkm_device_tegra_remove_iommu(tdev);
free:
kfree(tdev);
return ret;
} }
#else #else
int int