[PATCH] drm/radeon: fix missing bo reservation

[Alex Deucher]

On Thu, Feb 20, 2014 at 12:47 PM, Christian König
<deathsimple at vodafone.de> wrote:
> From: Christian König <christian.koenig at amd.com>
>
> Otherwise we might get a crash here.
>
> Signed-off-by: Christian König <christian.koenig at amd.com>
> Cc: stable at vger.kernel.org

Good catch.  Applied to my fixes tree.

Thanks!

Alex

> ---
>  drivers/gpu/drm/radeon/radeon_kms.c | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
> index 114d167..2aecd6d 100644
> --- a/drivers/gpu/drm/radeon/radeon_kms.c
> +++ b/drivers/gpu/drm/radeon/radeon_kms.c
> @@ -537,6 +537,10 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
>
>                 radeon_vm_init(rdev, &fpriv->vm);
>
> +               r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false);
> +               if (r)
> +                       return r;
> +
>                 /* map the ib pool buffer read only into
>                  * virtual address space */
>                 bo_va = radeon_vm_bo_add(rdev, &fpriv->vm,
> @@ -544,6 +548,8 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
>                 r = radeon_vm_bo_set_addr(rdev, bo_va, RADEON_VA_IB_OFFSET,
>                                           RADEON_VM_PAGE_READABLE |
>                                           RADEON_VM_PAGE_SNOOPED);
> +
> +               radeon_bo_unreserve(rdev->ring_tmp_bo.bo);
>                 if (r) {
>                         radeon_vm_fini(rdev, &fpriv->vm);
>                         kfree(fpriv);
> --
> 1.8.3.2
>