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

Commit 870571a5 authored by Thierry Reding's avatar Thierry Reding Committed by Dave Airlie
Browse files

drm/nouveau: platform: Fix deferred probe 



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

Cc: stable@vger.kernel.org # v4.3+
Reviewed-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 398cb0c9

drivers/gpu/drm/nouveau/nouveau_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
static int nouveau_platform_probe(struct platform_device *pdev)

{

	const struct nvkm_device_tegra_func *func;

	struct nvkm_device *device;

	struct nvkm_device *device = NULL;

	struct drm_device *drm;

	int ret;

drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c

+29 −11
Original line number Diff line number Diff line
@@ -252,32 +252,40 @@ nvkm_device_tegra_new(const struct nvkm_device_tegra_func *func, 


	if (!(tdev = kzalloc(sizeof(*tdev), GFP_KERNEL)))

		return -ENOMEM;

	*pdevice = &tdev->device;



	tdev->func = func;

	tdev->pdev = pdev;

	tdev->irq = -1;



	tdev->vdd = devm_regulator_get(&pdev->dev, "vdd");

	if (IS_ERR(tdev->vdd))

		return PTR_ERR(tdev->vdd);

	if (IS_ERR(tdev->vdd)) {

		ret = PTR_ERR(tdev->vdd);

		goto free;

	}



	tdev->rst = devm_reset_control_get(&pdev->dev, "gpu");

	if (IS_ERR(tdev->rst))

		return PTR_ERR(tdev->rst);

	if (IS_ERR(tdev->rst)) {

		ret = PTR_ERR(tdev->rst);

		goto free;

	}



	tdev->clk = devm_clk_get(&pdev->dev, "gpu");

	if (IS_ERR(tdev->clk))

		return PTR_ERR(tdev->clk);

	if (IS_ERR(tdev->clk)) {

		ret = PTR_ERR(tdev->clk);

		goto free;

	}



	tdev->clk_pwr = devm_clk_get(&pdev->dev, "pwr");

	if (IS_ERR(tdev->clk_pwr))

		return PTR_ERR(tdev->clk_pwr);

	if (IS_ERR(tdev->clk_pwr)) {

		ret = PTR_ERR(tdev->clk_pwr);

		goto free;

	}



	nvkm_device_tegra_probe_iommu(tdev);



	ret = nvkm_device_tegra_power_up(tdev);

	if (ret)

		return ret;

		goto remove;



	tdev->gpu_speedo = tegra_sku_info.gpu_speedo_value;

	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,

			       &tdev->device);

	if (ret)

		return ret;

		goto powerdown;



	*pdevice = &tdev->device;



	return 0;



powerdown:

	nvkm_device_tegra_power_down(tdev);

remove:

	nvkm_device_tegra_remove_iommu(tdev);

free:

	kfree(tdev);

	return ret;

}

#else

int