On Tue, Jul 02, 2013 at 04:55:16PM +0900, YoungJun Cho wrote: > Dear Daniel, > > On Jul 2, 2013 4:19 PM, "Daniel Vetter" <daniel.vetter@xxxxxxxx> wrote: > > > > In > > > > commit da34242e5e0638312130f5bd5d2d277afbc6f806 > > Author: YoungJun Cho <yj44.cho@xxxxxxxxxxx> > > Date: Wed Jun 26 10:21:42 2013 +0900 > > > > drm/prime: add return check for dma_buf_fd > > > > the failure case handling was fixed up. But in the case when we > > already had the buffer exported it changed the return value: > > Previously we've return 0 on success, now we return the fd. > > > > This ABI change has been caught by i-g-t/prime_self_import/with_one_bo. > > > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66436 > > Cc: YoungJun Cho <yj44.cho@xxxxxxxxxxx> > > Cc: Seung-Woo Kim <sw0312.kim@xxxxxxxxxxx> > > Cc: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> > > Tested-by: lu hua <huax.lu@xxxxxxxxx> > > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx> > > --- > > drivers/gpu/drm/drm_prime.c | 7 +++++-- > > 1 file changed, 5 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c > > index 52709f2..1e0de41 100644 > > --- a/drivers/gpu/drm/drm_prime.c > > +++ b/drivers/gpu/drm/drm_prime.c > > @@ -347,10 +347,13 @@ int drm_gem_prime_handle_to_fd(struct drm_device > *dev, > > out_have_obj: > > get_dma_buf(dmabuf); > > ret = dma_buf_fd(dmabuf, flags); > > - if (ret < 0) > > + if (ret < 0) { > > dma_buf_put(dmabuf); > > - else > > + } else { > > *prime_fd = ret; > > + ret = 0; > > + } > > + > > goto out; > > > > fail_rm_handle: > > -- > > 1.7.10.4 > > > > > > Right, that's my mistake. > I'll pay attention from now on! > > Thank you & best regards YJ Reviewed-by ? Cheers, Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel
