drm: Branch 'master'

 freedreno/freedreno_bo.c |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 7d98a93cec1c9b3b4b790799242fc35dbaf3a9c8
Author: Rob Clark <[email protected]>
Date:   Thu Sep 3 14:56:02 2015 -0400

    freedreno: don't take ownership of the dmabuf fd on import
    
    EGL_EXT_image_dma_buf_import specifies that the importer retains
    ownership of the fd, rather then the importee.
    
    Signed-off-by: Rob Clark <[email protected]>

diff --git a/freedreno/freedreno_bo.c b/freedreno/freedreno_bo.c
index 80ecd3a..1cb6759 100644
--- a/freedreno/freedreno_bo.c
+++ b/freedreno/freedreno_bo.c
@@ -245,7 +245,6 @@ fd_bo_from_dmabuf(struct fd_device *dev, int fd)
 	lseek(fd, 0, SEEK_CUR);
 
 	bo = bo_from_handle(dev, size, handle);
-	bo->fd = fd;
 
 out_unlock:
 	pthread_mutex_unlock(&table_lock);

------------------------------------------------------------------------------
Monitor Your Dynamic Infrastructure at Any Scale With Datadog!
Get real-time metrics from all of your servers, apps and tools
in one place.
SourceForge users - Click here to start your Free Trial of Datadog now!
http://pubads.g.doubleclick.net/gampad/clk?id=241902991&iu=/4140
--