drm/msm/a6xx: Drop the device reference in gmu (998efc74) · Commits · 戴 / test

of_find_device_by_node() grabs a dev reference, so make sure we clear it on error and remove. Changes in v2: - Added to the set (Jordan) Cc: Jordan Crouse <jcrouse@codeaurora.org> Reviewed-by:

Jordan Crouse <jcrouse@codeaurora.org> Signed-off-by:

Sean Paul <seanpaul@chromium.org> Link: https://patchwork.freedesktop.org/patch/msgid/20190523171653.138678-5-sean@poorly.run

drivers/gpu/drm/msm/adreno/a6xx_gmu.c

+11 −3

Original line number	Diff line number	Diff line
		@@ -1253,6 +1253,9 @@ void a6xx_gmu_remove(struct a6xx_gpu *a6xx_gpu)
		free_irq(gmu->gmu_irq, gmu);
		free_irq(gmu->hfi_irq, gmu);

		/* Drop reference taken in of_find_device_by_node */
		put_device(gmu->dev);

		gmu->initialized = false;
		}

		@@ -1277,12 +1280,12 @@ int a6xx_gmu_probe(struct a6xx_gpu a6xx_gpu, struct device_node node)
		/* Get the list of clocks */
		ret = a6xx_gmu_clocks_probe(gmu);
		if (ret)
		return ret;
		goto err_put_device;

		/* Set up the IOMMU context bank */
		ret = a6xx_gmu_memory_probe(gmu);
		if (ret)
		return ret;
		goto err_put_device;

		/* Allocate memory for for the HFI queues */
		gmu->hfi = a6xx_gmu_memory_alloc(gmu, SZ_16K);
		@@ -1334,6 +1337,11 @@ err_memory:

		iommu_domain_free(gmu->domain);
		}
		ret = -ENODEV;

		return -ENODEV;
		err_put_device:
		/* Drop reference taken in of_find_device_by_node */
		put_device(gmu->dev);

		return ret;
		}

Admin message