From 24bc382010cc1f2021a7ce8c62626b9e90ee30d0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
Date: Sat, 12 May 2012 12:12:21 +0200
Subject: [PATCH] radeonsi: Fixups for recent build infrastructure changes.

In particular for the pipe loader changes.
---
 configure.ac                                        |  2 ++
 src/gallium/targets/pipe-loader/Makefile            | 13 +++++++++++++
 .../targets/{gbm => pipe-loader}/pipe_radeonsi.c    |  0
 3 files changed, 15 insertions(+)
 rename src/gallium/targets/{gbm => pipe-loader}/pipe_radeonsi.c (100%)

diff --git a/configure.ac b/configure.ac
index 2d1265a7b63..e177846d78a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1980,6 +1980,8 @@ if test "x$with_gallium_drivers" != x; then
             gallium_check_st "radeon/drm" "dri-r600" "xorg-r600" "" "xvmc-r600" "vdpau-r600" "va-r600"
             ;;
         xradeonsi)
+            PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
+            gallium_require_drm_loader
             GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS radeonsi"
             if test "x$LLVM_VERSION" != "x3.1"; then
                 AC_MSG_ERROR([LLVM 3.1 is required to build the radeonsi driver.])
diff --git a/src/gallium/targets/pipe-loader/Makefile b/src/gallium/targets/pipe-loader/Makefile
index eb3b4fc8aa3..596539cc709 100644
--- a/src/gallium/targets/pipe-loader/Makefile
+++ b/src/gallium/targets/pipe-loader/Makefile
@@ -57,6 +57,12 @@ r600_LIBS = \
 	$(TOP)/src/gallium/drivers/r600/libr600.a
 r600_SYS += -ldrm_radeon
 
+# radeonsi pipe driver
+radeonsi_LIBS = \
+	$(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
+	$(TOP)/src/gallium/drivers/radeonsi/libradeonsi.a
+radeonsi_SYS += -ldrm_radeon
+
 # vmwgfx pipe driver
 vmwgfx_LIBS = \
 	$(TOP)/src/gallium/winsys/svga/drm/libsvgadrm.a \
@@ -105,6 +111,13 @@ ifneq ($(findstring r600,$(GALLIUM_DRIVERS_DIRS)),)
 endif
 endif
 
+ifneq ($(findstring radeon/drm,$(GALLIUM_WINSYS_DIRS)),)
+ifneq ($(findstring radeonsi,$(GALLIUM_DRIVERS_DIRS)),)
+   _PIPE_TARGETS_CC += $(PIPE_PREFIX)radeonsi.so
+   PIPE_SOURCES += pipe_radeonsi.c
+endif
+endif
+
 ifneq ($(findstring svga/drm,$(GALLIUM_WINSYS_DIRS)),)
    _PIPE_TARGETS_CC += $(PIPE_PREFIX)vmwgfx.so
    PIPE_SOURCES += pipe_vmwgfx.c
diff --git a/src/gallium/targets/gbm/pipe_radeonsi.c b/src/gallium/targets/pipe-loader/pipe_radeonsi.c
similarity index 100%
rename from src/gallium/targets/gbm/pipe_radeonsi.c
rename to src/gallium/targets/pipe-loader/pipe_radeonsi.c
-- 
2.30.2