Commit 981f2aab authored by Sean Paul's avatar Sean Paul
Browse files

drm/msm/a6xx: Rename a6xx_gmu_probe to a6xx_gmu_init 



This rename makes it more clear that everything initialized in the _init
function must be cleaned up in a6xx_gmu_remove. This will hopefully
dissuade people from using device managed resources (for reasons laid
out in the previous patch).

Changes in v2:
- None

Cc: Jordan Crouse <jcrouse@codeaurora.org>
Reviewed-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190523171653.138678-6-sean@poorly.run
parent 998efc74

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

+1 −1
Original line number Diff line number Diff line
@@ -1259,7 +1259,7 @@ void a6xx_gmu_remove(struct a6xx_gpu *a6xx_gpu) 
	gmu->initialized = false;

}



int a6xx_gmu_probe(struct a6xx_gpu *a6xx_gpu, struct device_node *node)

int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node)

{

	struct a6xx_gmu *gmu = &a6xx_gpu->gmu;

	struct platform_device *pdev = of_find_device_by_node(node);

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

+1 −1
Original line number Diff line number Diff line
@@ -854,7 +854,7 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev) 
	/* FIXME: How do we gracefully handle this? */

	BUG_ON(!node);



	ret = a6xx_gmu_probe(a6xx_gpu, node);

	ret = a6xx_gmu_init(a6xx_gpu, node);

	if (ret) {

		a6xx_destroy(&(a6xx_gpu->base.base));

		return ERR_PTR(ret);

drivers/gpu/drm/msm/adreno/a6xx_gpu.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ bool a6xx_gmu_isidle(struct a6xx_gmu *gmu); 
int a6xx_gmu_set_oob(struct a6xx_gmu *gmu, enum a6xx_gmu_oob_state state);

void a6xx_gmu_clear_oob(struct a6xx_gmu *gmu, enum a6xx_gmu_oob_state state);



int a6xx_gmu_probe(struct a6xx_gpu *a6xx_gpu, struct device_node *node);

int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node);

void a6xx_gmu_remove(struct a6xx_gpu *a6xx_gpu);



void a6xx_gmu_set_freq(struct msm_gpu *gpu, unsigned long freq);

CRA Git | Maintained and supported by SUSTech CRA and CCSE