diff options
| -rw-r--r-- | src/amd/Makefile.addrlib.am | 35 | ||||
| -rw-r--r-- | src/amd/Makefile.am | 3 | ||||
| -rw-r--r-- | src/amd/Makefile.sources | 24 | ||||
| -rw-r--r-- | src/amd/addrlib/addrinterface.cpp (renamed from src/gallium/winsys/amdgpu/drm/addrlib/addrinterface.cpp) | 0 | ||||
| -rw-r--r-- | src/amd/addrlib/addrinterface.h (renamed from src/gallium/winsys/amdgpu/drm/addrlib/addrinterface.h) | 0 | ||||
| -rw-r--r-- | src/amd/addrlib/addrtypes.h (renamed from src/gallium/winsys/amdgpu/drm/addrlib/addrtypes.h) | 0 | ||||
| -rw-r--r-- | src/amd/addrlib/core/addrcommon.h (renamed from src/gallium/winsys/amdgpu/drm/addrlib/core/addrcommon.h) | 0 | ||||
| -rw-r--r-- | src/amd/addrlib/core/addrelemlib.cpp (renamed from src/gallium/winsys/amdgpu/drm/addrlib/core/addrelemlib.cpp) | 0 | ||||
| -rw-r--r-- | src/amd/addrlib/core/addrelemlib.h (renamed from src/gallium/winsys/amdgpu/drm/addrlib/core/addrelemlib.h) | 0 | ||||
| -rw-r--r-- | src/amd/addrlib/core/addrlib.cpp (renamed from src/gallium/winsys/amdgpu/drm/addrlib/core/addrlib.cpp) | 0 | ||||
| -rw-r--r-- | src/amd/addrlib/core/addrlib.h (renamed from src/gallium/winsys/amdgpu/drm/addrlib/core/addrlib.h) | 0 | ||||
| -rw-r--r-- | src/amd/addrlib/core/addrobject.cpp (renamed from src/gallium/winsys/amdgpu/drm/addrlib/core/addrobject.cpp) | 0 | ||||
| -rw-r--r-- | src/amd/addrlib/core/addrobject.h (renamed from src/gallium/winsys/amdgpu/drm/addrlib/core/addrobject.h) | 0 | ||||
| -rw-r--r-- | src/amd/addrlib/inc/chip/r800/si_gb_reg.h (renamed from src/gallium/winsys/amdgpu/drm/addrlib/inc/chip/r800/si_gb_reg.h) | 0 | ||||
| -rw-r--r-- | src/amd/addrlib/inc/lnx_common_defs.h (renamed from src/gallium/winsys/amdgpu/drm/addrlib/inc/lnx_common_defs.h) | 0 | ||||
| -rw-r--r-- | src/amd/addrlib/r800/chip/si_ci_vi_merged_enum.h (renamed from src/gallium/winsys/amdgpu/drm/addrlib/r800/chip/si_ci_vi_merged_enum.h) | 0 | ||||
| -rw-r--r-- | src/amd/addrlib/r800/ciaddrlib.cpp (renamed from src/gallium/winsys/amdgpu/drm/addrlib/r800/ciaddrlib.cpp) | 0 | ||||
| -rw-r--r-- | src/amd/addrlib/r800/ciaddrlib.h (renamed from src/gallium/winsys/amdgpu/drm/addrlib/r800/ciaddrlib.h) | 0 | ||||
| -rw-r--r-- | src/amd/addrlib/r800/egbaddrlib.cpp (renamed from src/gallium/winsys/amdgpu/drm/addrlib/r800/egbaddrlib.cpp) | 0 | ||||
| -rw-r--r-- | src/amd/addrlib/r800/egbaddrlib.h (renamed from src/gallium/winsys/amdgpu/drm/addrlib/r800/egbaddrlib.h) | 0 | ||||
| -rw-r--r-- | src/amd/addrlib/r800/siaddrlib.cpp (renamed from src/gallium/winsys/amdgpu/drm/addrlib/r800/siaddrlib.cpp) | 0 | ||||
| -rw-r--r-- | src/amd/addrlib/r800/siaddrlib.h (renamed from src/gallium/winsys/amdgpu/drm/addrlib/r800/siaddrlib.h) | 0 | ||||
| -rw-r--r-- | src/amd/common/amdgpu_id.h (renamed from src/gallium/winsys/amdgpu/drm/amdgpu_id.h) | 2 | ||||
| -rw-r--r-- | src/gallium/winsys/amdgpu/drm/Makefile.am | 7 | ||||
| -rw-r--r-- | src/gallium/winsys/amdgpu/drm/Makefile.sources | 20 | ||||
| -rw-r--r-- | src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 2 |
26 files changed, 65 insertions, 28 deletions
diff --git a/src/amd/Makefile.addrlib.am b/src/amd/Makefile.addrlib.am new file mode 100644 index 00000000000..434e6923492 --- /dev/null +++ b/src/amd/Makefile.addrlib.am @@ -0,0 +1,35 @@ +# Copyright 2016 Red Hat Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. + +ADDRLIB_LIBS = addrlib/libamdgpu_addrlib.la + +addrlib_libamdgpu_addrlib_la_CPPFLAGS = \ + -I$(top_srcdir)/src/ \ + -I$(srcdir)/common \ + -I$(srcdir)/addrlib \ + -I$(srcdir)/addrlib/core \ + -I$(srcdir)/addrlib/inc/chip/r800 \ + -I$(srcdir)/addrlib/r800/chip \ + -DBRAHMA_BUILD=1 + +noinst_LTLIBRARIES += $(ADDRLIB_LIBS) + +addrlib_libamdgpu_addrlib_la_SOURCES = $(ADDRLIB_FILES) diff --git a/src/amd/Makefile.am b/src/amd/Makefile.am index d9b5a06195d..d01d43552ca 100644 --- a/src/amd/Makefile.am +++ b/src/amd/Makefile.am @@ -21,4 +21,7 @@ include Makefile.sources +noinst_LTLIBRARIES = + EXTRA_DIST = $(COMMON_HEADER_FILES) +include Makefile.addrlib.am diff --git a/src/amd/Makefile.sources b/src/amd/Makefile.sources index 7e08cd5bc6a..e5083248880 100644 --- a/src/amd/Makefile.sources +++ b/src/amd/Makefile.sources @@ -1,4 +1,26 @@ COMMON_HEADER_FILES = \ common/sid.h \ common/r600d_common.h \ - common/amd_family.h + common/amd_family.h \ + common/amdgpu_id.h + +ADDRLIB_FILES = \ + addrlib/addrinterface.cpp \ + addrlib/addrinterface.h \ + addrlib/addrtypes.h \ + addrlib/core/addrcommon.h \ + addrlib/core/addrelemlib.cpp \ + addrlib/core/addrelemlib.h \ + addrlib/core/addrlib.cpp \ + addrlib/core/addrlib.h \ + addrlib/core/addrobject.cpp \ + addrlib/core/addrobject.h \ + addrlib/inc/chip/r800/si_gb_reg.h \ + addrlib/inc/lnx_common_defs.h \ + addrlib/r800/chip/si_ci_vi_merged_enum.h \ + addrlib/r800/ciaddrlib.cpp \ + addrlib/r800/ciaddrlib.h \ + addrlib/r800/egbaddrlib.cpp \ + addrlib/r800/egbaddrlib.h \ + addrlib/r800/siaddrlib.cpp \ + addrlib/r800/siaddrlib.h diff --git a/src/gallium/winsys/amdgpu/drm/addrlib/addrinterface.cpp b/src/amd/addrlib/addrinterface.cpp index 65569278b1e..65569278b1e 100644 --- a/src/gallium/winsys/amdgpu/drm/addrlib/addrinterface.cpp +++ b/src/amd/addrlib/addrinterface.cpp diff --git a/src/gallium/winsys/amdgpu/drm/addrlib/addrinterface.h b/src/amd/addrlib/addrinterface.h index ead603378cf..ead603378cf 100644 --- a/src/gallium/winsys/amdgpu/drm/addrlib/addrinterface.h +++ b/src/amd/addrlib/addrinterface.h diff --git a/src/gallium/winsys/amdgpu/drm/addrlib/addrtypes.h b/src/amd/addrlib/addrtypes.h index 4c68ac544b8..4c68ac544b8 100644 --- a/src/gallium/winsys/amdgpu/drm/addrlib/addrtypes.h +++ b/src/amd/addrlib/addrtypes.h diff --git a/src/gallium/winsys/amdgpu/drm/addrlib/core/addrcommon.h b/src/amd/addrlib/core/addrcommon.h index f996c9a3402..f996c9a3402 100644 --- a/src/gallium/winsys/amdgpu/drm/addrlib/core/addrcommon.h +++ b/src/amd/addrlib/core/addrcommon.h diff --git a/src/gallium/winsys/amdgpu/drm/addrlib/core/addrelemlib.cpp b/src/amd/addrlib/core/addrelemlib.cpp index 76b1badf958..76b1badf958 100644 --- a/src/gallium/winsys/amdgpu/drm/addrlib/core/addrelemlib.cpp +++ b/src/amd/addrlib/core/addrelemlib.cpp diff --git a/src/gallium/winsys/amdgpu/drm/addrlib/core/addrelemlib.h b/src/amd/addrlib/core/addrelemlib.h index c302b3b1788..c302b3b1788 100644 --- a/src/gallium/winsys/amdgpu/drm/addrlib/core/addrelemlib.h +++ b/src/amd/addrlib/core/addrelemlib.h diff --git a/src/gallium/winsys/amdgpu/drm/addrlib/core/addrlib.cpp b/src/amd/addrlib/core/addrlib.cpp index 1df693e5be5..1df693e5be5 100644 --- a/src/gallium/winsys/amdgpu/drm/addrlib/core/addrlib.cpp +++ b/src/amd/addrlib/core/addrlib.cpp diff --git a/src/gallium/winsys/amdgpu/drm/addrlib/core/addrlib.h b/src/amd/addrlib/core/addrlib.h index 43c55ff32ff..43c55ff32ff 100644 --- a/src/gallium/winsys/amdgpu/drm/addrlib/core/addrlib.h +++ b/src/amd/addrlib/core/addrlib.h diff --git a/src/gallium/winsys/amdgpu/drm/addrlib/core/addrobject.cpp b/src/amd/addrlib/core/addrobject.cpp index 369be8c3046..369be8c3046 100644 --- a/src/gallium/winsys/amdgpu/drm/addrlib/core/addrobject.cpp +++ b/src/amd/addrlib/core/addrobject.cpp diff --git a/src/gallium/winsys/amdgpu/drm/addrlib/core/addrobject.h b/src/amd/addrlib/core/addrobject.h index 35400885afe..35400885afe 100644 --- a/src/gallium/winsys/amdgpu/drm/addrlib/core/addrobject.h +++ b/src/amd/addrlib/core/addrobject.h diff --git a/src/gallium/winsys/amdgpu/drm/addrlib/inc/chip/r800/si_gb_reg.h b/src/amd/addrlib/inc/chip/r800/si_gb_reg.h index cf67f602bdf..cf67f602bdf 100644 --- a/src/gallium/winsys/amdgpu/drm/addrlib/inc/chip/r800/si_gb_reg.h +++ b/src/amd/addrlib/inc/chip/r800/si_gb_reg.h diff --git a/src/gallium/winsys/amdgpu/drm/addrlib/inc/lnx_common_defs.h b/src/amd/addrlib/inc/lnx_common_defs.h index 61540f49b7e..61540f49b7e 100644 --- a/src/gallium/winsys/amdgpu/drm/addrlib/inc/lnx_common_defs.h +++ b/src/amd/addrlib/inc/lnx_common_defs.h diff --git a/src/gallium/winsys/amdgpu/drm/addrlib/r800/chip/si_ci_vi_merged_enum.h b/src/amd/addrlib/r800/chip/si_ci_vi_merged_enum.h index 5ed81add264..5ed81add264 100644 --- a/src/gallium/winsys/amdgpu/drm/addrlib/r800/chip/si_ci_vi_merged_enum.h +++ b/src/amd/addrlib/r800/chip/si_ci_vi_merged_enum.h diff --git a/src/gallium/winsys/amdgpu/drm/addrlib/r800/ciaddrlib.cpp b/src/amd/addrlib/r800/ciaddrlib.cpp index 7c5d29a2166..7c5d29a2166 100644 --- a/src/gallium/winsys/amdgpu/drm/addrlib/r800/ciaddrlib.cpp +++ b/src/amd/addrlib/r800/ciaddrlib.cpp diff --git a/src/gallium/winsys/amdgpu/drm/addrlib/r800/ciaddrlib.h b/src/amd/addrlib/r800/ciaddrlib.h index de995fa4058..de995fa4058 100644 --- a/src/gallium/winsys/amdgpu/drm/addrlib/r800/ciaddrlib.h +++ b/src/amd/addrlib/r800/ciaddrlib.h diff --git a/src/gallium/winsys/amdgpu/drm/addrlib/r800/egbaddrlib.cpp b/src/amd/addrlib/r800/egbaddrlib.cpp index e53479839e1..e53479839e1 100644 --- a/src/gallium/winsys/amdgpu/drm/addrlib/r800/egbaddrlib.cpp +++ b/src/amd/addrlib/r800/egbaddrlib.cpp diff --git a/src/gallium/winsys/amdgpu/drm/addrlib/r800/egbaddrlib.h b/src/amd/addrlib/r800/egbaddrlib.h index 25e38964be0..25e38964be0 100644 --- a/src/gallium/winsys/amdgpu/drm/addrlib/r800/egbaddrlib.h +++ b/src/amd/addrlib/r800/egbaddrlib.h diff --git a/src/gallium/winsys/amdgpu/drm/addrlib/r800/siaddrlib.cpp b/src/amd/addrlib/r800/siaddrlib.cpp index a858b55b7cf..a858b55b7cf 100644 --- a/src/gallium/winsys/amdgpu/drm/addrlib/r800/siaddrlib.cpp +++ b/src/amd/addrlib/r800/siaddrlib.cpp diff --git a/src/gallium/winsys/amdgpu/drm/addrlib/r800/siaddrlib.h b/src/amd/addrlib/r800/siaddrlib.h index 897beb1bb92..897beb1bb92 100644 --- a/src/gallium/winsys/amdgpu/drm/addrlib/r800/siaddrlib.h +++ b/src/amd/addrlib/r800/siaddrlib.h diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_id.h b/src/amd/common/amdgpu_id.h index 40b835c2248..f91df55711a 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_id.h +++ b/src/amd/common/amdgpu_id.h @@ -32,7 +32,7 @@ #ifndef AMDGPU_ID_H #define AMDGPU_ID_H -#include "pipe/p_config.h" +#include "util/u_endian.h" #if defined(PIPE_ARCH_LITTLE_ENDIAN) #define LITTLEENDIAN_CPU diff --git a/src/gallium/winsys/amdgpu/drm/Makefile.am b/src/gallium/winsys/amdgpu/drm/Makefile.am index a719913b157..543325cc2e5 100644 --- a/src/gallium/winsys/amdgpu/drm/Makefile.am +++ b/src/gallium/winsys/amdgpu/drm/Makefile.am @@ -4,14 +4,11 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ $(GALLIUM_WINSYS_CFLAGS) \ $(AMDGPU_CFLAGS) \ - -I$(srcdir)/addrlib \ - -I$(srcdir)/addrlib/core \ - -I$(srcdir)/addrlib/inc/chip/r800 \ - -I$(srcdir)/addrlib/r800/chip \ - -DBRAHMA_BUILD=1 + -I$(top_srcdir)/src/amd/ AM_CXXFLAGS = $(AM_CFLAGS) noinst_LTLIBRARIES = libamdgpuwinsys.la +libamdgpuwinsys_la_LIBADD = $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la libamdgpuwinsys_la_SOURCES = $(C_SOURCES) diff --git a/src/gallium/winsys/amdgpu/drm/Makefile.sources b/src/gallium/winsys/amdgpu/drm/Makefile.sources index 23630044ab3..cb2f01f162c 100644 --- a/src/gallium/winsys/amdgpu/drm/Makefile.sources +++ b/src/gallium/winsys/amdgpu/drm/Makefile.sources @@ -1,28 +1,8 @@ C_SOURCES := \ - addrlib/addrinterface.cpp \ - addrlib/addrinterface.h \ - addrlib/addrtypes.h \ - addrlib/core/addrcommon.h \ - addrlib/core/addrelemlib.cpp \ - addrlib/core/addrelemlib.h \ - addrlib/core/addrlib.cpp \ - addrlib/core/addrlib.h \ - addrlib/core/addrobject.cpp \ - addrlib/core/addrobject.h \ - addrlib/inc/chip/r800/si_gb_reg.h \ - addrlib/inc/lnx_common_defs.h \ - addrlib/r800/chip/si_ci_vi_merged_enum.h \ - addrlib/r800/ciaddrlib.cpp \ - addrlib/r800/ciaddrlib.h \ - addrlib/r800/egbaddrlib.cpp \ - addrlib/r800/egbaddrlib.h \ - addrlib/r800/siaddrlib.cpp \ - addrlib/r800/siaddrlib.h \ amdgpu_bo.c \ amdgpu_bo.h \ amdgpu_cs.c \ amdgpu_cs.h \ - amdgpu_id.h \ amdgpu_public.h \ amdgpu_surface.c \ amdgpu_winsys.c \ diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c index 0ae186174ee..33aa4929137 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c @@ -39,7 +39,7 @@ #include <xf86drm.h> #include <stdio.h> #include <sys/stat.h> -#include "amdgpu_id.h" +#include "amd/common/amdgpu_id.h" #define CIK_TILE_MODE_COLOR_2D 14 |