drm/amdgpu: minor CS optimization
Subsystems (2)
PATCH 1/1 drm/amdgpu: minor CS optimization
From: Christian König <[email protected]>
We only need to loop over all IBs for old UVD/VCE command stream patching.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 37 +++++++++++++++++----------------- 1 file changed, 19 insertions(+), 18 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +19 -18
@@ -855,36 +855,37 @@ static int amdgpu_cs_ib_vm_chunk(struct amdgpu_device *adev,struct amdgpu_fpriv *fpriv = p->filp->driver_priv;struct amdgpu_vm *vm = &fpriv->vm;struct amdgpu_ring *ring = p->job->ring; -int i, j, r; - -for (i =0 , j =0 ; i < p->nchunks && j < p->job->num_ibs; i++) { - -struct amdgpu_cs_chunk *chunk; -struct amdgpu_ib *ib; -struct drm_amdgpu_cs_chunk_ib *chunk_ib; - - chunk = &p->chunks[i]; - ib = &p->job->ibs[j]; - chunk_ib = (struct drm_amdgpu_cs_chunk_ib *)chunk->kdata; +int r; -if (chunk->chunk_id !=AMDGPU_CHUNK_ID_IB ) -continue ; +/* Only for UVD/VCE VM emulation */ +if (p->job->ring->funcs->parse_cs) { +unsigned i, j; -if (p->job->ring->funcs->parse_cs) { +for (i =0 , j =0 ; i < p->nchunks && j < p->job->num_ibs; i++) { +struct drm_amdgpu_cs_chunk_ib *chunk_ib;struct amdgpu_bo_va_mapping *m;struct amdgpu_bo *aobj =NULL ; +struct amdgpu_cs_chunk *chunk; +struct amdgpu_ib *ib;uint64_t offset;uint8_t *kptr; + chunk = &p->chunks[i]; + ib = &p->job->ibs[j]; + chunk_ib = chunk->kdata; + +if (chunk->chunk_id !=AMDGPU_CHUNK_ID_IB ) +continue ; + r =amdgpu_cs_find_mapping (p, chunk_ib->va_start, - &aobj, &m); + &aobj, &m);if (r) {DRM_ERROR ("IB va_start is invalid\n" );return r; }if ((chunk_ib->va_start + chunk_ib->ib_bytes) > - (m->last +1 ) *AMDGPU_GPU_PAGE_SIZE ) { + (m->last +1 ) *AMDGPU_GPU_PAGE_SIZE ) {DRM_ERROR ("IB va_start+ib_bytes is invalid\n" );return -EINVAL ; }
@@ -901,12 +902,12 @@ static int amdgpu_cs_ib_vm_chunk(struct amdgpu_device *adev,memcpy (ib->ptr, kptr, chunk_ib->ib_bytes);amdgpu_bo_kunmap (aobj); -/* Only for UVD/VCE VM emulation */ r =amdgpu_ring_parse_cs (ring, p, j);if (r)return r; + + j++; } - j++; }if (p->job->vm) {
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1507803606-1364-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 7 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Christian König
Sent: Thursday, October 12, 2017 6:20 AM
To: Grodzovsky, Andrey; [email protected]
Subject: [PATCH] drm/amdgpu: minor CS optimization
Quoted 6 lines
From: Christian König <[email protected]>
We only need to loop over all IBs for old UVD/VCE command stream patching.
Signed-off-by Christian König <[email protected]>
Quoted 86 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 37 +++++++++++++++++---- ------------- 1 file changed, 19 insertions(+), 18 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +17
-16@@ -855,36 +855,37 @@ static int amdgpu_cs_ib_vm_chunk(structamdgpu_device *adev, struct amdgpu_fpriv *fpriv = p->filp->driver_priv;struct amdgpu_vm *vm = &fpriv->vm;struct amdgpu_ring *ring = p->job->ring; -int i, j, r; - -for (i =0 , j =0 ; i < p->nchunks && j < p->job->num_ibs; i++) { - -struct amdgpu_cs_chunk *chunk; -struct amdgpu_ib *ib; -struct drm_amdgpu_cs_chunk_ib *chunk_ib; - - chunk = &p->chunks[i]; - ib = &p->job->ibs[j]; - chunk_ib = (struct drm_amdgpu_cs_chunk_ib *)chunk- >kdata; +int r; -if (chunk->chunk_id !=AMDGPU_CHUNK_ID_IB ) -continue ; +/* Only for UVD/VCE VM emulation */ +if (p->job->ring->funcs->parse_cs) { +unsigned i, j; -if (p->job->ring->funcs->parse_cs) { +for (i =0 , j =0 ; i < p->nchunks && j < p->job->num_ibs; i++) { +struct drm_amdgpu_cs_chunk_ib *chunk_ib;struct amdgpu_bo_va_mapping *m;struct amdgpu_bo *aobj =NULL ; +struct amdgpu_cs_chunk *chunk; +struct amdgpu_ib *ib;uint64_t offset;uint8_t *kptr; + chunk = &p->chunks[i]; + ib = &p->job->ibs[j]; + chunk_ib = chunk->kdata; + +if (chunk->chunk_id !=AMDGPU_CHUNK_ID_IB ) +continue ; + r =amdgpu_cs_find_mapping (p, chunk_ib->va_start, - &aobj, &m); + &aobj, &m);if (r) {DRM_ERROR ("IB va_start is invalid\n" );return r; }if ((chunk_ib->va_start + chunk_ib->ib_bytes) > - (m->last +1 ) *AMDGPU_GPU_PAGE_SIZE ) { + (m->last +1 ) *AMDGPU_GPU_PAGE_SIZE ) { DRM_ERROR("IB va_start+ib_bytes isinvalid\n");
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +2
-2return -EINVAL ; }@@ -901,12 +902,12 @@ static int amdgpu_cs_ib_vm_chunk(struct amdgpu_device *adev,memcpy (ib->ptr, kptr, chunk_ib->ib_bytes);amdgpu_bo_kunmap (aobj); -/* Only for UVD/VCE VM emulation */ r =amdgpu_ring_parse_cs (ring, p, j);if (r)return r; + + j++; } - j++; }if (
p->job->vm) {
--
2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx