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

Commit 4c7eb91c authored by Junwei Zhang's avatar Junwei Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: refine the job naming for amdgpu_job and amdgpu_sched_job 



Use consistent naming across functions.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDavid Zhou <david1.zhou@amd.com>
Signed-off-by: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
parent bf60efd3

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −1
Original line number Diff line number Diff line
@@ -1275,7 +1275,7 @@ struct amdgpu_job { 
	uint32_t		num_ibs;

	struct mutex            job_lock;

	struct amdgpu_user_fence uf;

	int (*free_job)(struct amdgpu_job *sched_job);

	int (*free_job)(struct amdgpu_job *job);

};



static inline u32 amdgpu_get_ib_value(struct amdgpu_cs_parser *p, uint32_t ib_idx, int idx)

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

+7 −7
Original line number Diff line number Diff line
@@ -778,15 +778,15 @@ static int amdgpu_cs_dependencies(struct amdgpu_device *adev, 
	return 0;

}



static int amdgpu_cs_free_job(struct amdgpu_job *sched_job)

static int amdgpu_cs_free_job(struct amdgpu_job *job)

{

	int i;

	if (sched_job->ibs)

		for (i = 0; i < sched_job->num_ibs; i++)

			amdgpu_ib_free(sched_job->adev, &sched_job->ibs[i]);

	kfree(sched_job->ibs);

	if (sched_job->uf.bo)

		drm_gem_object_unreference_unlocked(&sched_job->uf.bo->gem_base);

	if (job->ibs)

		for (i = 0; i < job->num_ibs; i++)

			amdgpu_ib_free(job->adev, &job->ibs[i]);

	kfree(job->ibs);

	if (job->uf.bo)

		drm_gem_object_unreference_unlocked(&job->uf.bo->gem_base);

	return 0;

}

drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c

+18 −18
Original line number Diff line number Diff line
@@ -27,42 +27,42 @@ 
#include <drm/drmP.h>

#include "amdgpu.h"



static struct fence *amdgpu_sched_dependency(struct amd_sched_job *job)

static struct fence *amdgpu_sched_dependency(struct amd_sched_job *sched_job)

{

	struct amdgpu_job *sched_job = (struct amdgpu_job *)job;

	return amdgpu_sync_get_fence(&sched_job->ibs->sync);

	struct amdgpu_job *job = (struct amdgpu_job *)sched_job;

	return amdgpu_sync_get_fence(&job->ibs->sync);

}



static struct fence *amdgpu_sched_run_job(struct amd_sched_job *job)

static struct fence *amdgpu_sched_run_job(struct amd_sched_job *sched_job)

{

	struct amdgpu_fence *fence = NULL;

	struct amdgpu_job *sched_job;

	struct amdgpu_job *job;

	int r;



	if (!job) {

	if (!sched_job) {

		DRM_ERROR("job is null\n");

		return NULL;

	}

	sched_job = (struct amdgpu_job *)job;

	mutex_lock(&sched_job->job_lock);

	r = amdgpu_ib_schedule(sched_job->adev,

			       sched_job->num_ibs,

			       sched_job->ibs,

			       sched_job->base.owner);

	job = (struct amdgpu_job *)sched_job;

	mutex_lock(&job->job_lock);

	r = amdgpu_ib_schedule(job->adev,

			       job->num_ibs,

			       job->ibs,

			       job->base.owner);

	if (r) {

		DRM_ERROR("Error scheduling IBs (%d)\n", r);

		goto err;

	}



	fence = amdgpu_fence_ref(sched_job->ibs[sched_job->num_ibs - 1].fence);

	fence = amdgpu_fence_ref(job->ibs[job->num_ibs - 1].fence);



err:

	if (sched_job->free_job)

		sched_job->free_job(sched_job);

	if (job->free_job)

		job->free_job(job);



	mutex_unlock(&sched_job->job_lock);

	fence_put(&sched_job->base.s_fence->base);

	kfree(sched_job);

	mutex_unlock(&job->job_lock);

	fence_put(&job->base.s_fence->base);

	kfree(job);

	return fence ? &fence->base : NULL;

}

drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c

+3 −3
Original line number Diff line number Diff line
@@ -805,10 +805,10 @@ int amdgpu_uvd_ring_parse_cs(struct amdgpu_cs_parser *parser, uint32_t ib_idx) 
}



static int amdgpu_uvd_free_job(

	struct amdgpu_job *sched_job)

	struct amdgpu_job *job)

{

	amdgpu_ib_free(sched_job->adev, sched_job->ibs);

	kfree(sched_job->ibs);

	amdgpu_ib_free(job->adev, job->ibs);

	kfree(job->ibs);

	return 0;

}

drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c

+3 −3
Original line number Diff line number Diff line
@@ -342,10 +342,10 @@ void amdgpu_vce_free_handles(struct amdgpu_device *adev, struct drm_file *filp) 
}



static int amdgpu_vce_free_job(

	struct amdgpu_job *sched_job)

	struct amdgpu_job *job)

{

	amdgpu_ib_free(sched_job->adev, sched_job->ibs);

	kfree(sched_job->ibs);

	amdgpu_ib_free(job->adev, job->ibs);

	kfree(job->ibs);

	return 0;

}