Re: [Mesa-dev] [PATCH v2 08/14] Android: push driver build details to driver makefiles

[Emil Velikov]

On 3 May 2017 at 20:35, Rob Herring  wrote:

> +SUBDIRS += winsys/amdgpu/drm drivers/radeonsi drivers/radeon
Barring any objections I'll add "winsys/radeon/drm" here since
radeonsi can use that winsys.

Thanks
Emil
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH v2 08/14] Android: push driver build details to driver makefiles

[Rob Herring]

src/gallium/targets/dri/Android.mk contains lots of conditional for
individual drivers. Let's move these details into the individual driver
makefiles.

In the process, align the make driver conditionals with automake
(i.e. HAVE_GALLIUM_*).

Signed-off-by: Rob Herring 
---
 Android.mk| 50 +-
 src/egl/Android.mk| 18 +-
 src/gallium/Android.mk| 13 ---
 src/gallium/drivers/freedreno/Android.mk  |  5 +++
 src/gallium/drivers/i915/Android.mk   |  4 +++
 src/gallium/drivers/nouveau/Android.mk|  5 +++
 src/gallium/drivers/r300/Android.mk   |  4 +++
 src/gallium/drivers/r600/Android.mk   |  9 +
 src/gallium/drivers/radeon/Android.mk |  7 +++-
 src/gallium/drivers/radeonsi/Android.mk   | 13 ++-
 src/gallium/drivers/softpipe/Android.mk   |  4 +++
 src/gallium/drivers/svga/Android.mk   |  4 +++
 src/gallium/drivers/vc4/Android.mk|  4 +++
 src/gallium/drivers/virgl/Android.mk  |  4 +++
 src/gallium/state_trackers/dri/Android.mk |  2 +-
 src/gallium/targets/dri/Android.mk| 60 ---
 src/gallium/winsys/amdgpu/drm/Android.mk  |  5 +++
 src/gallium/winsys/i915/drm/Android.mk|  4 +++
 18 files changed, 121 insertions(+), 94 deletions(-)

diff --git a/Android.mk b/Android.mk
index 08daf770f26b..71140df02c63 100644
--- a/Android.mk
+++ b/Android.mk
@@ -40,19 +40,31 @@ MESA_DRI_MODULE_UNSTRIPPED_PATH := 
$(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/$(M
 MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk
 MESA_PYTHON2 := python
 
-classic_drivers := i915 i965
-gallium_drivers := swrast freedreno i915g nouveau r300g r600g radeonsi vmwgfx 
vc4 virgl
+# Lists to convert driver names to boolean variables
+# in form of .
+classic_drivers := i915.HAVE_I915_DRI i965.HAVE_I965_DRI
+gallium_drivers := \
+   swrast.HAVE_GALLIUM_SOFTPIPE \
+   freedreno.HAVE_GALLIUM_FREEDRENO \
+   i915g.HAVE_GALLIUM_I915 \
+   nouveau.HAVE_GALLIUM_NOUVEAU \
+   r300g.HAVE_GALLIUM_R300 \
+   r600g.HAVE_GALLIUM_R600 \
+   radeonsi.HAVE_GALLIUM_RADEONSI \
+   vmwgfx.HAVE_GALLIUM_VMWGFX \
+   vc4.HAVE_GALLIUM_VC4 \
+   virgl.HAVE_GALLIUM_VIRGL
 
-MESA_GPU_DRIVERS := $(strip $(BOARD_GPU_DRIVERS))
-
-# warn about invalid drivers
-invalid_drivers := $(filter-out \
-   $(classic_drivers) $(gallium_drivers), $(MESA_GPU_DRIVERS))
-ifneq ($(invalid_drivers),)
-$(warning invalid GPU drivers: $(invalid_drivers))
-# tidy up
-MESA_GPU_DRIVERS := $(filter-out $(invalid_drivers), $(MESA_GPU_DRIVERS))
-endif
+# Warn if we have any invalid driver names
+$(foreach d, $(BOARD_GPU_DRIVERS), \
+   $(if $(findstring $(d).,$(classic_drivers) $(gallium_drivers)), \
+   , \
+   $(warning invalid GPU driver: $(d)) \
+   ) \
+)
+MESA_BUILD_CLASSIC := $(strip $(foreach d, $(BOARD_GPU_DRIVERS), $(patsubst 
$(d).%,%, $(filter $(d).%, $(classic_drivers)
+MESA_BUILD_GALLIUM := $(strip $(foreach d, $(BOARD_GPU_DRIVERS), $(patsubst 
$(d).%,%, $(filter $(d).%, $(gallium_drivers)
+$(foreach d, $(MESA_BUILD_CLASSIC) $(MESA_BUILD_GALLIUM), $(eval $(d) := true))
 
 # host and target must be the same arch to generate matypes.h
 ifeq ($(TARGET_ARCH),$(HOST_ARCH))
@@ -61,20 +73,10 @@ else
 MESA_ENABLE_ASM := false
 endif
 
-ifneq ($(filter $(classic_drivers), $(MESA_GPU_DRIVERS)),)
-MESA_BUILD_CLASSIC := true
-else
-MESA_BUILD_CLASSIC := false
+ifneq ($(filter true, $(HAVE_GALLIUM_RADEONSI)),)
+MESA_ENABLE_LLVM := true
 endif
 
-ifneq ($(filter $(gallium_drivers), $(MESA_GPU_DRIVERS)),)
-MESA_BUILD_GALLIUM := true
-else
-MESA_BUILD_GALLIUM := false
-endif
-
-MESA_ENABLE_LLVM := $(if $(filter radeonsi,$(MESA_GPU_DRIVERS)),true,false)
-
 # add subdirectories
 SUBDIRS := \
src/gbm \
diff --git a/src/egl/Android.mk b/src/egl/Android.mk
index 8bbd4605cdca..5fc37e1709d5 100644
--- a/src/egl/Android.mk
+++ b/src/egl/Android.mk
@@ -57,16 +57,16 @@ LOCAL_SHARED_LIBRARIES := \
libcutils \
libsync
 
-ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
-# require i915_dri and/or i965_dri
-LOCAL_REQUIRED_MODULES += \
-   $(addsuffix _dri, $(filter i915 i965, $(MESA_GPU_DRIVERS)))
-endif # MESA_BUILD_CLASSIC
-
-ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
+# This controls enabling building of driver libraries
+ifneq ($(HAVE_I915_DRI),)
+LOCAL_REQUIRED_MODULES += i915_dri
+endif
+ifneq ($(HAVE_I965_DRI),)
+LOCAL_REQUIRED_MODULES += i965_dri
+endif
+ifneq ($(MESA_BUILD_GALLIUM),)
 LOCAL_REQUIRED_MODULES += gallium_dri
-endif # MESA_BUILD_GALLIUM
-
+endif
 
 LOCAL_MODULE := libGLES_mesa
 LOCAL_MODULE_RELATIVE_PATH := egl
diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk
index 7c6bda68d59f..3473641b4934 100644
--- a/src/gallium/Android.mk
+++ b/src/gallium/Android.mk
@@ -37,12 +37,17 @@ SUBDIRS += winsys/sw/dri drivers/softpipe
 SUBDIRS += winsys/freedreno/drm drivers/freedreno
 SUBDIRS +=