[PATCH 06/10] drm/amdgpu: properly imbed the IBs into the job

[Andrey Grodzovsky]

Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky at amd.com>

Andrey

On 2022-03-03 03:23, Christian König wrote:
> We now have standard macros for that.
>
> Signed-off-by: Christian König <christian.koenig at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 7 +------
>   drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 6 ++++--
>   2 files changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
> index 38c9fd7b7ad4..e4ca62225996 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
> @@ -78,14 +78,10 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job)
>   int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs,
>   		     struct amdgpu_job **job, struct amdgpu_vm *vm)
>   {
> -	size_t size = sizeof(struct amdgpu_job);
> -
>   	if (num_ibs == 0)
>   		return -EINVAL;
>   
> -	size += sizeof(struct amdgpu_ib) * num_ibs;
> -
> -	*job = kzalloc(size, GFP_KERNEL);
> +	*job = kzalloc(struct_size(*job, ibs, num_ibs), GFP_KERNEL);
>   	if (!*job)
>   		return -ENOMEM;
>   
> @@ -95,7 +91,6 @@ int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs,
>   	 */
>   	(*job)->base.sched = &adev->rings[0]->sched;
>   	(*job)->vm = vm;
> -	(*job)->ibs = (void *)&(*job)[1];
>   	(*job)->num_ibs = num_ibs;
>   
>   	amdgpu_sync_create(&(*job)->sync);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.h
> index 6d704772ff42..d599c0540b46 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.h
> @@ -25,6 +25,7 @@
>   
>   #include <drm/gpu_scheduler.h>
>   #include "amdgpu_sync.h"
> +#include "amdgpu_ring.h"
>   
>   /* bit set means command submit involves a preamble IB */
>   #define AMDGPU_PREAMBLE_IB_PRESENT          (1 << 0)
> @@ -48,12 +49,10 @@ struct amdgpu_job {
>   	struct amdgpu_vm	*vm;
>   	struct amdgpu_sync	sync;
>   	struct amdgpu_sync	sched_sync;
> -	struct amdgpu_ib	*ibs;
>   	struct dma_fence	hw_fence;
>   	struct dma_fence	*external_hw_fence;
>   	uint32_t		preamble_status;
>   	uint32_t                preemption_status;
> -	uint32_t		num_ibs;
>   	bool                    vm_needs_flush;
>   	uint64_t		vm_pd_addr;
>   	unsigned		vmid;
> @@ -69,6 +68,9 @@ struct amdgpu_job {
>   
>   	/* job_run_counter >= 1 means a resubmit job */
>   	uint32_t		job_run_counter;
> +
> +	uint32_t		num_ibs;
> +	struct amdgpu_ib	ibs[];
>   };
>   
>   int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs,