drm/msm/gpu: fix bo size for msm_rbmemptrs

Submitted by Chia-I Wu on Dec. 20, 2018, 6:47 p.m.

Details

Message ID 20181220184702.103067-1-olvaffe@gmail.com
State New
Headers show
Series "drm/msm/gpu: fix bo size for msm_rbmemptrs" ( rev: 2 ) in Freedreno

Not browsing as part of any series.

Commit Message

Chia-I Wu Dec. 20, 2018, 6:47 p.m.
memptrs_bo is used to store msm_rbmemptrs.  Size it correctly.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
---
 drivers/gpu/drm/msm/msm_gpu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index 11aac8337066..d23049eb29c4 100644
--- a/drivers/gpu/drm/msm/msm_gpu.c
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@ -917,7 +917,7 @@  int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev,
 		goto fail;
 	}
 
-	memptrs = msm_gem_kernel_new(drm, sizeof(*gpu->memptrs_bo),
+	memptrs = msm_gem_kernel_new(drm, sizeof(struct msm_rbmemptrs) * nr_rings,
 		MSM_BO_UNCACHED, gpu->aspace, &gpu->memptrs_bo,
 		&memptrs_iova);
 

Comments

On Thu, Dec 20, 2018 at 10:47:02AM -0800, Chia-I Wu wrote:
> memptrs_bo is used to store msm_rbmemptrs.  Size it correctly.
> 
> Signed-off-by: Chia-I Wu <olvaffe@gmail.com>

Thanks for your patch. I'm really glad somebody is looking seriously at this
code.  We have this in msm-next:

https://cgit.freedesktop.org/~robclark/linux/commit/?h=msm-next&id=546ec7b471bcae78463426a218b8c7f35bbb71f4

I think that might fix your concern?

Jordan

> ---
>  drivers/gpu/drm/msm/msm_gpu.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
> index 11aac8337066..d23049eb29c4 100644
> --- a/drivers/gpu/drm/msm/msm_gpu.c
> +++ b/drivers/gpu/drm/msm/msm_gpu.c
> @@ -917,7 +917,7 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev,
>  		goto fail;
>  	}
>  
> -	memptrs = msm_gem_kernel_new(drm, sizeof(*gpu->memptrs_bo),
> +	memptrs = msm_gem_kernel_new(drm, sizeof(struct msm_rbmemptrs) * nr_rings,
>  		MSM_BO_UNCACHED, gpu->aspace, &gpu->memptrs_bo,
>  		&memptrs_iova);
>  
> -- 
> 2.18.1
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Ah, thanks.  I was on drm-next branch.  I will switch to msm-next.

On Thu, Dec 20, 2018 at 11:47 AM Jordan Crouse <jcrouse@codeaurora.org>
wrote:

> On Thu, Dec 20, 2018 at 10:47:02AM -0800, Chia-I Wu wrote:
> > memptrs_bo is used to store msm_rbmemptrs.  Size it correctly.
> >
> > Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
>
> Thanks for your patch. I'm really glad somebody is looking seriously at
> this
> code.  We have this in msm-next:
>
>
> https://cgit.freedesktop.org/~robclark/linux/commit/?h=msm-next&id=546ec7b471bcae78463426a218b8c7f35bbb71f4
>
> I think that might fix your concern?
>
> Jordan
>
> > ---
> >  drivers/gpu/drm/msm/msm_gpu.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/msm/msm_gpu.c
> b/drivers/gpu/drm/msm/msm_gpu.c
> > index 11aac8337066..d23049eb29c4 100644
> > --- a/drivers/gpu/drm/msm/msm_gpu.c
> > +++ b/drivers/gpu/drm/msm/msm_gpu.c
> > @@ -917,7 +917,7 @@ int msm_gpu_init(struct drm_device *drm, struct
> platform_device *pdev,
> >               goto fail;
> >       }
> >
> > -     memptrs = msm_gem_kernel_new(drm, sizeof(*gpu->memptrs_bo),
> > +     memptrs = msm_gem_kernel_new(drm, sizeof(struct msm_rbmemptrs) *
> nr_rings,
> >               MSM_BO_UNCACHED, gpu->aspace, &gpu->memptrs_bo,
> >               &memptrs_iova);
> >
> > --
> > 2.18.1
> >
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
> --
> The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
> a Linux Foundation Collaborative Project
>