Commit 030af2b0 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm: drop drm_gem_object_put_locked() 



No idea why we were still using this.  It certainly hasn't been needed
for some time.  So drop the pointless twin codepaths.

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://lore.kernel.org/r/20210728010632.2633470-4-robdclark@gmail.com


Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 86c2a0f0

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

+2 −2
Original line number Diff line number Diff line
@@ -117,13 +117,13 @@ reset_set(void *data, u64 val) 


	if (a5xx_gpu->pm4_bo) {

		msm_gem_unpin_iova(a5xx_gpu->pm4_bo, gpu->aspace);

		drm_gem_object_put_locked(a5xx_gpu->pm4_bo);

		drm_gem_object_put(a5xx_gpu->pm4_bo);

		a5xx_gpu->pm4_bo = NULL;

	}



	if (a5xx_gpu->pfp_bo) {

		msm_gem_unpin_iova(a5xx_gpu->pfp_bo, gpu->aspace);

		drm_gem_object_put_locked(a5xx_gpu->pfp_bo);

		drm_gem_object_put(a5xx_gpu->pfp_bo);

		a5xx_gpu->pfp_bo = NULL;

	}

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

+3 −3
Original line number Diff line number Diff line
@@ -1415,7 +1415,7 @@ struct a5xx_gpu_state { 
static int a5xx_crashdumper_init(struct msm_gpu *gpu,

		struct a5xx_crashdumper *dumper)

{

	dumper->ptr = msm_gem_kernel_new_locked(gpu->dev,

	dumper->ptr = msm_gem_kernel_new(gpu->dev,

		SZ_1M, MSM_BO_WC, gpu->aspace,

		&dumper->bo, &dumper->iova);
@@ -1517,7 +1517,7 @@ static void a5xx_gpu_state_get_hlsq_regs(struct msm_gpu *gpu, 


	if (a5xx_crashdumper_run(gpu, &dumper)) {

		kfree(a5xx_state->hlsqregs);

		msm_gem_kernel_put(dumper.bo, gpu->aspace, true);

		msm_gem_kernel_put(dumper.bo, gpu->aspace);

		return;

	}
@@ -1525,7 +1525,7 @@ static void a5xx_gpu_state_get_hlsq_regs(struct msm_gpu *gpu, 
	memcpy(a5xx_state->hlsqregs, dumper.ptr + (256 * SZ_1K),

		count * sizeof(u32));



	msm_gem_kernel_put(dumper.bo, gpu->aspace, true);

	msm_gem_kernel_put(dumper.bo, gpu->aspace);

}



static struct msm_gpu_state *a5xx_gpu_state_get(struct msm_gpu *gpu)

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

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ void a5xx_gpmu_ucode_init(struct msm_gpu *gpu) 
	 */

	bosize = (cmds_size + (cmds_size / TYPE4_MAX_PAYLOAD) + 1) << 2;



	ptr = msm_gem_kernel_new_locked(drm, bosize,

	ptr = msm_gem_kernel_new(drm, bosize,

		MSM_BO_WC | MSM_BO_GPU_READONLY, gpu->aspace,

		&a5xx_gpu->gpmu_bo, &a5xx_gpu->gpmu_iova);

	if (IS_ERR(ptr))

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

+3 −4
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static int preempt_init_ring(struct a5xx_gpu *a5xx_gpu, 
		A5XX_PREEMPT_COUNTER_SIZE,

		MSM_BO_WC, gpu->aspace, &counters_bo, &counters_iova);

	if (IS_ERR(counters)) {

		msm_gem_kernel_put(bo, gpu->aspace, true);

		msm_gem_kernel_put(bo, gpu->aspace);

		return PTR_ERR(counters);

	}
@@ -272,9 +272,8 @@ void a5xx_preempt_fini(struct msm_gpu *gpu) 
	int i;



	for (i = 0; i < gpu->nr_rings; i++) {

		msm_gem_kernel_put(a5xx_gpu->preempt_bo[i], gpu->aspace, true);

		msm_gem_kernel_put(a5xx_gpu->preempt_counters_bo[i],

			gpu->aspace, true);

		msm_gem_kernel_put(a5xx_gpu->preempt_bo[i], gpu->aspace);

		msm_gem_kernel_put(a5xx_gpu->preempt_counters_bo[i], gpu->aspace);

	}

}

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

+6 −6
Original line number Diff line number Diff line
@@ -1129,12 +1129,12 @@ int a6xx_gmu_stop(struct a6xx_gpu *a6xx_gpu) 


static void a6xx_gmu_memory_free(struct a6xx_gmu *gmu)

{

	msm_gem_kernel_put(gmu->hfi.obj, gmu->aspace, false);

	msm_gem_kernel_put(gmu->debug.obj, gmu->aspace, false);

	msm_gem_kernel_put(gmu->icache.obj, gmu->aspace, false);

	msm_gem_kernel_put(gmu->dcache.obj, gmu->aspace, false);

	msm_gem_kernel_put(gmu->dummy.obj, gmu->aspace, false);

	msm_gem_kernel_put(gmu->log.obj, gmu->aspace, false);

	msm_gem_kernel_put(gmu->hfi.obj, gmu->aspace);

	msm_gem_kernel_put(gmu->debug.obj, gmu->aspace);

	msm_gem_kernel_put(gmu->icache.obj, gmu->aspace);

	msm_gem_kernel_put(gmu->dcache.obj, gmu->aspace);

	msm_gem_kernel_put(gmu->dummy.obj, gmu->aspace);

	msm_gem_kernel_put(gmu->log.obj, gmu->aspace);



	gmu->aspace->mmu->funcs->detach(gmu->aspace->mmu);

	msm_gem_address_space_put(gmu->aspace);