drm: Branch 'master'

 freedreno/freedreno_bo.c |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 739b8886025b31f2f9d09a535c8ff3670bb1d036
Author: Nicolas Dechesne <[email protected]>
Date:   Mon Apr 11 16:50:23 2016 +0200

    freedreno: add dummy fd_bo_from_fbdev implementation when KGSL is disabled
    
    Make sure that this function is defined (even empty/dummy) when KGSL support is
    disabled, since it's part of the driver i/f and it was reported to cause symbols
    issues when building against musl libc implementation.
    
    Reported-by: Khem Raj <[email protected]>
    Signed-off-by: Nicolas Dechesne <[email protected]>
    Signed-off-by: Rob Clark <[email protected]>

diff --git a/freedreno/freedreno_bo.c b/freedreno/freedreno_bo.c
index a23c65d..82c1f15 100644
--- a/freedreno/freedreno_bo.c
+++ b/freedreno/freedreno_bo.c
@@ -431,3 +431,10 @@ void fd_bo_cpu_fini(struct fd_bo *bo)
 {
 	bo->funcs->cpu_fini(bo);
 }
+
+#ifndef HAVE_FREEDRENO_KGSL
+struct fd_bo * fd_bo_from_fbdev(struct fd_pipe *pipe, int fbfd, uint32_t size)
+{
+    return NULL;
+}
+#endif

------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
--