[PATCH 5/8] drm/radeon: let bo_reserve take no_intr instead of no_wait param

[Jerome Glisse]

On Tue, Sep 11, 2012 at 10:10 AM, Christian König
<deathsimple at vodafone.de> wrote:
> The no_wait param isn't used anywhere, and actually isn't
> very usefull at all.
>
> Signed-off-by: Christian König <deathsimple at vodafone.de>

Reviewed-by: Jerome Glisse

> ---
>  drivers/gpu/drm/radeon/radeon_object.c |    7 +++----
>  drivers/gpu/drm/radeon/radeon_object.h |    2 +-
>  2 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
> index 2844e0b..8d23b7e 100644
> --- a/drivers/gpu/drm/radeon/radeon_object.c
> +++ b/drivers/gpu/drm/radeon/radeon_object.c
> @@ -627,18 +627,17 @@ int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type, bool no_wait)
>  /**
>   * radeon_bo_reserve - reserve bo
>   * @bo:                bo structure
> - * @no_wait:           don't sleep while trying to reserve (return -EBUSY)
> + * @no_intr:   don't return -ERESTARTSYS on pending signal
>   *
>   * Returns:
> - * -EBUSY: buffer is busy and @no_wait is true
>   * -ERESTARTSYS: A wait for the buffer to become unreserved was interrupted by
>   * a signal. Release all buffer reservations and return to user-space.
>   */
> -int radeon_bo_reserve(struct radeon_bo *bo, bool no_wait)
> +int radeon_bo_reserve(struct radeon_bo *bo, bool no_intr)
>  {
>         int r;
>
> -       r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, 0);
> +       r = ttm_bo_reserve(&bo->tbo, !no_intr, false, false, 0);
>         if (unlikely(r != 0)) {
>                 if (r != -ERESTARTSYS)
>                         dev_err(bo->rdev->dev, "%p reserve failed\n", bo);
> diff --git a/drivers/gpu/drm/radeon/radeon_object.h b/drivers/gpu/drm/radeon/radeon_object.h
> index 2aaf6e3..93cd491 100644
> --- a/drivers/gpu/drm/radeon/radeon_object.h
> +++ b/drivers/gpu/drm/radeon/radeon_object.h
> @@ -52,7 +52,7 @@ static inline unsigned radeon_mem_type_to_domain(u32 mem_type)
>         return 0;
>  }
>
> -int radeon_bo_reserve(struct radeon_bo *bo, bool no_wait);
> +int radeon_bo_reserve(struct radeon_bo *bo, bool no_intr);
>
>  static inline void radeon_bo_unreserve(struct radeon_bo *bo)
>  {
> --
> 1.7.9.5
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel