From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jerome Glisse Subject: Re: [PATCH WW 08/13] drm/radeon: inline reservations Date: Thu, 27 Jun 2013 18:04:18 -0400 Message-ID: <20130627220418.GD4380@gmail.com> References: <1372333708-29884-1-git-send-email-maarten.lankhorst@canonical.com> <1372333708-29884-9-git-send-email-maarten.lankhorst@canonical.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-qa0-f48.google.com (mail-qa0-f48.google.com [209.85.216.48]) by gabe.freedesktop.org (Postfix) with ESMTP id 709E8E6495 for ; Thu, 27 Jun 2013 15:04:21 -0700 (PDT) Received: by mail-qa0-f48.google.com with SMTP id cm16so150879qab.0 for ; Thu, 27 Jun 2013 15:04:21 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1372333708-29884-9-git-send-email-maarten.lankhorst@canonical.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Maarten Lankhorst Cc: Dave Airlie , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Thu, Jun 27, 2013 at 01:48:23PM +0200, Maarten Lankhorst wrote: > Signed-off-by: Maarten Lankhorst Reviewed-by: Jerome Glisse > --- > drivers/gpu/drm/radeon/radeon_object.c | 23 ----------------------- > drivers/gpu/drm/radeon/radeon_object.h | 22 +++++++++++++++++++++- > 2 files changed, 21 insertions(+), 24 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c > index 71287bb..d850dc6 100644 > --- a/drivers/gpu/drm/radeon/radeon_object.c > +++ b/drivers/gpu/drm/radeon/radeon_object.c > @@ -619,26 +619,3 @@ int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type, bool no_wait) > ttm_bo_unreserve(&bo->tbo); > return r; > } > - > - > -/** > - * radeon_bo_reserve - reserve bo > - * @bo: bo structure > - * @no_intr: don't return -ERESTARTSYS on pending signal > - * > - * Returns: > - * -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_intr) > -{ > - int r; > - > - 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); > - return r; > - } > - return 0; > -} > diff --git a/drivers/gpu/drm/radeon/radeon_object.h b/drivers/gpu/drm/radeon/radeon_object.h > index 3e62a3a..456ad6b 100644 > --- a/drivers/gpu/drm/radeon/radeon_object.h > +++ b/drivers/gpu/drm/radeon/radeon_object.h > @@ -52,7 +52,27 @@ static inline unsigned radeon_mem_type_to_domain(u32 mem_type) > return 0; > } > > -int radeon_bo_reserve(struct radeon_bo *bo, bool no_intr); > +/** > + * radeon_bo_reserve - reserve bo > + * @bo: bo structure > + * @no_intr: don't return -ERESTARTSYS on pending signal > + * > + * Returns: > + * -ERESTARTSYS: A wait for the buffer to become unreserved was interrupted by > + * a signal. Release all buffer reservations and return to user-space. > + */ > +static inline int radeon_bo_reserve(struct radeon_bo *bo, bool no_intr) > +{ > + int r; > + > + 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); > + return r; > + } > + return 0; > +} > > static inline void radeon_bo_unreserve(struct radeon_bo *bo) > { > -- > 1.8.3.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel