drm: Branch 'master' - 2 commits

 intel/intel_bufmgr_fake.c |    6 +++---
 nouveau/nouveau.c         |    2 +-
 nouveau/pushbuf.c         |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 4b737cde8f689b66709850cf6794c699f935622c
Author: Eric Engestrom <[email protected]>
Date:   Thu Sep 20 16:52:30 2018 +0100

    nouveau: add missing drm_public exports
    
    Fixes: d7320bfcddc596f23fa2 "nouveau: annotate public functions"
    Cc: Lucas De Marchi <[email protected]>
    Cc: Mark Janes <[email protected]>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108006
    Signed-off-by: Eric Engestrom <[email protected]>
    Reviewed-by: Dylan Baker <[email protected]>
    Tested-by: Dylan Baker <[email protected]>

diff --git a/nouveau/nouveau.c b/nouveau/nouveau.c
index 5be0611e..f18d1426 100644
--- a/nouveau/nouveau.c
+++ b/nouveau/nouveau.c
@@ -856,7 +856,7 @@ nouveau_bo_wait(struct nouveau_bo *bo, uint32_t access,
 	return ret;
 }
 
-int
+drm_public int
 nouveau_bo_map(struct nouveau_bo *bo, uint32_t access,
 	       struct nouveau_client *client)
 {
diff --git a/nouveau/pushbuf.c b/nouveau/pushbuf.c
index 856ae7ee..e5f73f0d 100644
--- a/nouveau/pushbuf.c
+++ b/nouveau/pushbuf.c
@@ -728,7 +728,7 @@ nouveau_pushbuf_data(struct nouveau_pushbuf *push, struct nouveau_bo *bo,
 	}
 }
 
-int
+drm_public int
 nouveau_pushbuf_refn(struct nouveau_pushbuf *push,
 		     struct nouveau_pushbuf_refn *refs, int nr)
 {
commit a2920ea6a8e3daa79e9885abd6b762b3079fde86
Author: Eric Engestrom <[email protected]>
Date:   Thu Sep 20 16:51:45 2018 +0100

    intel: add missing drm_public exports
    
    Fixes: 36bb0ea47b71d220b31e "intel: annotate public functions"
    Cc: Lucas De Marchi <[email protected]>
    Cc: Mark Janes <[email protected]>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108006
    Signed-off-by: Eric Engestrom <[email protected]>
    Reviewed-by: Dylan Baker <[email protected]>
    Tested-by: Dylan Baker <[email protected]>

diff --git a/intel/intel_bufmgr_fake.c b/intel/intel_bufmgr_fake.c
index 57cbc536..0cec51f5 100644
--- a/intel/intel_bufmgr_fake.c
+++ b/intel/intel_bufmgr_fake.c
@@ -241,7 +241,7 @@ FENCE_LTE(unsigned a, unsigned b)
 	return 0;
 }
 
-void
+drm_public void
 drm_intel_bufmgr_fake_set_fence_callback(drm_intel_bufmgr *bufmgr,
 					 unsigned int (*emit) (void *priv),
 					 void (*wait) (unsigned int fence,
@@ -955,7 +955,7 @@ drm_intel_fake_bo_unreference(drm_intel_bo *bo)
  * Set the buffer as not requiring backing store, and instead get the callback
  * invoked whenever it would be set dirty.
  */
-void
+drm_public void
 drm_intel_bo_fake_disable_backing_store(drm_intel_bo *bo,
 					void (*invalidate_cb) (drm_intel_bo *bo,
 							       void *ptr),
@@ -1409,7 +1409,7 @@ drm_intel_bo_fake_post_submit(drm_intel_bo *bo)
 	bo_fake->write_domain = 0;
 }
 
-void
+drm_public void
 drm_intel_bufmgr_fake_set_exec_callback(drm_intel_bufmgr *bufmgr,
 					     int (*exec) (drm_intel_bo *bo,
 							  unsigned int used,


--