Import Mesa 20.1.6

3 files changed, 9 insertions, 3 deletions

diff --git a/lib/mesa/src/broadcom/drm-shim/meson.build b/lib/mesa/src/broadcom/drm-shim/meson.build
index 4fcc594ad..d053d2c5b 100644
--- a/lib/mesa/src/broadcom/drm-shim/meson.build
+++ b/lib/mesa/src/broadcom/drm-shim/meson.build
@@ -21,7 +21,7 @@
 libv3d_noop_drm_shim = shared_library(
   ['v3d_noop_drm_shim'],
   'v3d_noop.c',
-  include_directories: inc_common,
+  include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies: dep_drm_shim,
   c_args : c_vis_args,
   install : true,
@@ -41,7 +41,7 @@ if dep_v3dv3.found()
                             'v3dx.c',
                             v3d_xml_pack
         ],
-        include_directories : [inc_common, inc_broadcom, inc_src, inc_gallium_v3d],
+        include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom, inc_gallium_v3d],
         c_args : [c_vis_args, no_override_init_args, '-DV3D_VERSION=' + ver, v3dv3_c_args],
         dependencies: [dep_valgrind, dep_thread, dep_v3dv3],
     )
@@ -55,7 +55,7 @@ if dep_v3dv3.found()
     ],
     dependencies: [idep_mesautil, dep_dl, dep_drm_shim, dep_v3dv3],
     link_with: per_version_libs,
-    include_directories : [inc_common, inc_broadcom, inc_gallium_v3d],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom, inc_gallium_v3d],
     c_args : [c_vis_args, no_override_init_args, '-std=gnu99', v3dv3_c_args],
     cpp_args : [v3dv3_c_args]
   )
diff --git a/lib/mesa/src/broadcom/drm-shim/v3d.c b/lib/mesa/src/broadcom/drm-shim/v3d.c
index e75657f59..f4d5bd313 100644
--- a/lib/mesa/src/broadcom/drm-shim/v3d.c
+++ b/lib/mesa/src/broadcom/drm-shim/v3d.c
@@ -28,6 +28,8 @@
 #include "v3d.h"
 #include "v3d_simulator_wrapper.h"
 
+bool drm_shim_driver_prefers_first_render_node = false;
+
 static struct v3d_device_info devinfo;
 struct v3d_shim_device v3d = {
         .devinfo = &devinfo
@@ -78,6 +80,7 @@ v3d_ioctl_get_bo_offset(int fd, unsigned long request, void *arg)
 void
 drm_shim_driver_init(void)
 {
+        shim_device.bus_type = DRM_BUS_PLATFORM;
         shim_device.driver_name = "v3d";
 
         drm_shim_override_file("OF_FULLNAME=/rdb/v3d\n"
diff --git a/lib/mesa/src/broadcom/drm-shim/v3d_noop.c b/lib/mesa/src/broadcom/drm-shim/v3d_noop.c
index 7c7d75128..fd92e8859 100644
--- a/lib/mesa/src/broadcom/drm-shim/v3d_noop.c
+++ b/lib/mesa/src/broadcom/drm-shim/v3d_noop.c
@@ -28,6 +28,8 @@
 #include "drm-uapi/v3d_drm.h"
 #include "drm-shim/drm_shim.h"
 
+bool drm_shim_driver_prefers_first_render_node = true;
+
 struct v3d_bo {
         struct shim_bo base;
         uint32_t offset;
@@ -146,6 +148,7 @@ static ioctl_fn_t driver_ioctls[] = {
 void
 drm_shim_driver_init(void)
 {
+        shim_device.bus_type = DRM_BUS_PLATFORM;
         shim_device.driver_name = "v3d";
         shim_device.driver_ioctls = driver_ioctls;
         shim_device.driver_ioctl_count = ARRAY_SIZE(driver_ioctls);