summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/pipe-loader
diff options
context:
space:
mode:
authorNicolai Hähnle <[email protected]>2017-06-29 17:31:57 +0200
committerNicolai Hähnle <[email protected]>2017-08-02 09:50:58 +0200
commit0f8c5de8690e7c87aa2e24383065efaca7e6fe78 (patch)
tree8d5016c420b51feca47957d001c17d78731d971d /src/gallium/targets/pipe-loader
parent1e334a396c3bfac6d2ea2871db9bf5e9abc42934 (diff)
radeonsi: prepare for driver-specific driconf options
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/targets/pipe-loader')
-rw-r--r--src/gallium/targets/pipe-loader/Makefile.am1
-rw-r--r--src/gallium/targets/pipe-loader/pipe_radeonsi.c9
2 files changed, 10 insertions, 0 deletions
diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am
index 6b116184f5b..400b198fe29 100644
--- a/src/gallium/targets/pipe-loader/Makefile.am
+++ b/src/gallium/targets/pipe-loader/Makefile.am
@@ -27,6 +27,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/gallium/drivers \
-I$(top_srcdir)/src/gallium/winsys \
+ -I$(top_builddir)/src/util \
$(GALLIUM_PIPE_LOADER_DEFINES) \
$(LIBDRM_CFLAGS) \
$(VISIBILITY_CFLAGS) \
diff --git a/src/gallium/targets/pipe-loader/pipe_radeonsi.c b/src/gallium/targets/pipe-loader/pipe_radeonsi.c
index 598baf58da3..2d33d0e336c 100644
--- a/src/gallium/targets/pipe-loader/pipe_radeonsi.c
+++ b/src/gallium/targets/pipe-loader/pipe_radeonsi.c
@@ -4,6 +4,7 @@
#include "radeon/radeon_winsys.h"
#include "amdgpu/drm/amdgpu_public.h"
#include "radeonsi/si_public.h"
+#include "util/xmlpool.h"
static struct pipe_screen *
create_screen(int fd, const struct pipe_screen_config *config)
@@ -31,11 +32,19 @@ static const struct drm_conf_ret share_fd_ret = {
static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
{
+ static const struct drm_conf_ret xml_options_ret = {
+ .type = DRM_CONF_POINTER,
+ .val.val_pointer =
+#include "radeonsi/si_driinfo.h"
+ };
+
switch (conf) {
case DRM_CONF_THROTTLE:
return &throttle_ret;
case DRM_CONF_SHARE_FD:
return &share_fd_ret;
+ case DRM_CONF_XML_OPTIONS:
+ return &xml_options_ret;
default:
break;
}