Commit f1b79965 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-msm-next-2021-07-28' of https://gitlab.freedesktop.org/drm/msm into drm-next 



An early pull for v5.15 (there'll be more coming in a week or two),
consisting of the drm/scheduler conversion and a couple other small
series that one was based one.  Mostly sending this now because IIUC
danvet wanted it in drm-next so he could rebase on it.  (Daniel, if
you disagree then speak up, and I'll instead include this in the main
pull request once that is ready.)

This also has a core patch to drop drm_gem_object_put_locked() now
that the last use of it is removed.

[airlied: add NULL to drm_sched_init]

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGumRk7H88bqV=H9Fb1SM0zPBo5B7NsCU3jFFKBYxf5k+Q@mail.gmail.com
parents cfeeb0b5 4541e4f2

drivers/gpu/drm/drm_gem.c

+0 −22
Original line number Diff line number Diff line
@@ -973,28 +973,6 @@ drm_gem_object_free(struct kref *kref) 
}

EXPORT_SYMBOL(drm_gem_object_free);



/**

 * drm_gem_object_put_locked - release a GEM buffer object reference

 * @obj: GEM buffer object

 *

 * This releases a reference to @obj. Callers must hold the

 * &drm_device.struct_mutex lock when calling this function, even when the

 * driver doesn't use &drm_device.struct_mutex for anything.

 *

 * For drivers not encumbered with legacy locking use

 * drm_gem_object_put() instead.

 */

void

drm_gem_object_put_locked(struct drm_gem_object *obj)

{

	if (obj) {

		WARN_ON(!mutex_is_locked(&obj->dev->struct_mutex));



		kref_put(&obj->refcount, drm_gem_object_free);

	}

}

EXPORT_SYMBOL(drm_gem_object_put_locked);



/**

 * drm_gem_vm_open - vma->ops->open implementation for GEM

 * @vma: VM area structure

drivers/gpu/drm/msm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ config DRM_MSM 
	select REGULATOR

	select DRM_KMS_HELPER

	select DRM_PANEL

	select DRM_SCHED

	select SHMEM

	select TMPFS

	select QCOM_SCM if ARCH_QCOM

drivers/gpu/drm/msm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ msm-y := \ 
	msm_gem_submit.o \

	msm_gem_vma.o \

	msm_gpu.o \

	msm_gpu_devfreq.o \

	msm_iommu.o \

	msm_perf.o \

	msm_rd.o \

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)