From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 1/7] drm/udl: fix error-path when damage-req fails Date: Tue, 21 Jan 2014 10:43:13 +0100 Message-ID: <20140121094313.GO15089@phenom.ffwll.local> References: <1390245989-13280-1-git-send-email-dh.herrmann@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f51.google.com (mail-ee0-f51.google.com [74.125.83.51]) by gabe.freedesktop.org (Postfix) with ESMTP id CB6271057CC for ; Tue, 21 Jan 2014 01:43:18 -0800 (PST) Received: by mail-ee0-f51.google.com with SMTP id b57so3926125eek.38 for ; Tue, 21 Jan 2014 01:43:16 -0800 (PST) Content-Disposition: inline In-Reply-To: <1390245989-13280-1-git-send-email-dh.herrmann@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: David Herrmann Cc: Daniel Vetter , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Mon, Jan 20, 2014 at 08:26:23PM +0100, David Herrmann wrote: > We need to call dma_buf_end_cpu_access() in case a damage-request. > Unlikely, but might happen during device unplug. > > Signed-off-by: David Herrmann > --- > drivers/gpu/drm/udl/udl_fb.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c > index dbadd49..50f564d 100644 > --- a/drivers/gpu/drm/udl/udl_fb.c > +++ b/drivers/gpu/drm/udl/udl_fb.c > @@ -421,9 +421,10 @@ static int udl_user_framebuffer_dirty(struct drm_framebuffer *fb, > clips[i].x2 - clips[i].x1, > clips[i].y2 - clips[i].y1); > if (ret) > - goto unlock; > + goto end_access; break instead of a goto? > } > > +end_access: > if (ufb->obj->base.import_attach) { > dma_buf_end_cpu_access(ufb->obj->base.import_attach->dmabuf, > 0, ufb->obj->base.size, > -- > 1.8.5.3 > -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch