drm/msm: 4.10 fixes
Subsystems (4)
cover drm/msm: 4.10 fixes
Here is a short trio of drm/msm fixes suitable for 4.10. The first fixes a hang that occurs when the ring is completely filled, the other two can be triggered through the API and cause mild distress.
Jordan Crouse (3):
drm/msm: Ensure that the hardware write pointer is valid drm/msm: Put back the vaddr in submit_reloc() drm/msm: Verify that MSM_SUBMIT_BO_FLAGS are set
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 9 ++++++++- drivers/gpu/drm/msm/msm_gem_submit.c | 18 +++++++++++------- 2 files changed, 19 insertions(+), 8 deletions(-)
Signature · 1 line
1.9.1
A message that is not in the archive (sent off-list or not yet received): 1482249271-16043-1-git-send-email-jcrouse-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
PATCH 1/3 drm/msm: Ensure that the hardware write pointer is valid
Currently the value written to CP_RB_WPTR is calculated on the fly as (rb->next - rb->start). But as the code is designed rb->next is wrapped before writing the commands so if a series of commands happened to fit perfectly in the ringbuffer, rb->next would end up being equal to rb->size / 4 and thus result in an out of bounds address to CP_RB_WPTR.
The easiest way to fix this is to mask WPTR when writing it to the hardware; it makes the hardware happy and the rest of the ringbuffer math appears to work and there isn't any point in upsetting anything.
--- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/adreno_gpu.c +8 -1
@@ -210,7 +210,14 @@ void adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,void adreno_flush (struct msm_gpu *gpu) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu); -uint32_t wptr =get_wptr (gpu->rb); +uint32_t wptr; + +/* +* Mask wptr value that we calculate to fit in the HW range. This is +* to account for the possibility that the last command fit exactly into +* the ringbuffer and rb->next hasn't wrapped to zero yet +*/ + wptr =get_wptr (gpu->rb) & ((rb->size /4 ) -1 );/* ensure writes to ringbuffer have hit system memory: */ mb ();
Signature · 6 lines
1.9.1 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH 2/3 drm/msm: Put back the vaddr in submit_reloc()
In reply to Jordan CrouseThe error cases in submit_reloc() need to put back the virtual address of the bo before failling. Add a single failure path for the function.
--- drivers/gpu/drm/msm/msm_gem_submit.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/gpu/drm/msm/msm_gem_submit.c +9 -6
@@ -290,7 +290,7 @@ static int submit_reloc(struct msm_gem_submit *submit, struct msm_gem_object *ob {uint32_t i, last_offset =0 ;uint32_t *ptr; -int ret; +int ret =0 ;if (offset %4 ) {DRM_ERROR ("non-aligned cmdstream buffer: %u\n" , offset);
@@ -317,12 +317,13 @@ static int submit_reloc(struct msm_gem_submit *submit, struct msm_gem_object *ob ret =copy_from_user (&submit_reloc, userptr,sizeof (submit_reloc));if (ret) -return -EFAULT ; + goto out;if (submit_reloc.submit_offset %4 ) {DRM_ERROR ("non-aligned reloc offset: %u\n" , submit_reloc.submit_offset); -return -EINVAL ; + ret = -EINVAL ; + goto out; }/* offset in dwords: */
@@ -331,12 +332,13 @@ static int submit_reloc(struct msm_gem_submit *submit, struct msm_gem_object *obif ((off >= (obj->base.size /4 )) || (off < last_offset)) {DRM_ERROR ("invalid offset %u at reloc %u\n" , off, i); -return -EINVAL ; + ret = -EINVAL ; + goto out; } ret =submit_bo (submit, submit_reloc.reloc_idx,NULL , &iova, &valid);if (ret) -return ret; + goto out;if (valid)continue ;
@@ -353,9 +355,10 @@ static int submit_reloc(struct msm_gem_submit *submit, struct msm_gem_object *ob last_offset = off; } +out:msm_gem_put_vaddr_locked (&obj->base); -return 0 ; +return ret; }static void submit_cleanup (struct msm_gem_submit *submit)
Signature · 1 line
1.9.1
PATCH 3/3 drm/msm: Verify that MSM_SUBMIT_BO_FLAGS are set
In reply to Jordan CrouseFor every submission buffer object one of MSM_SUBMIT_BO_WRITE and MSM_SUBMIT_BO_READ must be set (and nothing else). If we allowed zero then the buffer object would never get queued to be unreferenced.
--- drivers/gpu/drm/msm/msm_gem_submit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_gem_submit.c +2 -1
@@ -106,7 +106,8 @@ static int submit_lookup_objects(struct msm_gem_submit *submit,pagefault_disable (); } -if (submit_bo.flags & ~MSM_SUBMIT_BO_FLAGS ) { +if ((submit_bo.flags & ~MSM_SUBMIT_BO_FLAGS ) || + !(submit_bo.flags &MSM_SUBMIT_BO_FLAGS )) {DRM_ERROR ("invalid flags: %x\n" , submit_bo.flags); ret = -EINVAL ; goto out_unlock;
Signature · 1 line
1.9.1