diff options
| author | Alyssa Rosenzweig <[email protected]> | 2019-10-26 15:10:22 -0400 |
|---|---|---|
| committer | Alyssa Rosenzweig <[email protected]> | 2019-10-31 15:26:10 +0000 |
| commit | bf15318991e3111fa3d94a9d3d564c7c539b9f23 (patch) | |
| tree | ff909db32836dbda58f97790747e44bb63e2f6e4 /src/gallium | |
| parent | 5ea787950f6e7feb0f9f3a146ae0d626bad19b63 (diff) | |
pipe-loader: Build kmsro loader for with all kmsro targets
Build failure reported by i965 CI, triggered by building dynamic
pipeloaders with kmsro drivers (besides 'frost). At this point, there's
no reason to actually do that -- mesa CI didn't mind -- but let's not
break the build.
v2: Simplify script. Add extra dependencies for v3d.
Fixes: afb0d08cb0f ("pipe-loader: Default to kmsro if probe fails")
Signed-off-by: Alyssa Rosenzweig <[email protected]>
Reported-by: Clayton Craft <[email protected]>
Tested-by: Clayton Craft <[email protected]>
Reviewed-by: Tomeu Vizoso <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/targets/pipe-loader/meson.build | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/gallium/targets/pipe-loader/meson.build b/src/gallium/targets/pipe-loader/meson.build index df6d223ab2d..4be3a59971b 100644 --- a/src/gallium/targets/pipe-loader/meson.build +++ b/src/gallium/targets/pipe-loader/meson.build @@ -47,6 +47,15 @@ endif pipe_loader_install_dir = join_paths(get_option('libdir'), 'gallium-pipe') +_kmsro_targets = [ + driver_kmsro, driver_v3d, driver_vc4, driver_freedreno, driver_etnaviv, + driver_panfrost, driver_lima, +] + +if with_gallium_v3d + _kmsro_targets += [idep_xmlconfig, dep_expat] +endif + pipe_loaders = [ [with_gallium_i915, 'i915', driver_i915, []], [with_gallium_nouveau, 'nouveau', driver_nouveau, []], @@ -54,7 +63,7 @@ pipe_loaders = [ [with_gallium_r600, 'r600', driver_r600, []], [with_gallium_radeonsi, 'radeonsi', [driver_radeonsi, idep_xmlconfig], []], [with_gallium_freedreno, 'msm', driver_freedreno, []], - [with_gallium_panfrost, 'kmsro', [driver_kmsro, driver_panfrost], []], + [with_gallium_kmsro, 'kmsro', _kmsro_targets, []], [with_gallium_svga, 'vmwgfx', driver_svga, []], [with_gallium_softpipe, 'swrast', [driver_swrast, driver_swr], [libwsw, libws_null]], ] |