diff options
| author | Eric Anholt <[email protected]> | 2015-11-21 12:52:48 -0800 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-11-29 17:54:41 +0000 |
| commit | 06c3ed8d219f3099062691c3dbf13b0c8d293301 (patch) | |
| tree | 9dcfda5bc470e1241f10fab96ae675c4d20c2a77 | |
| parent | cfbb08168a2302b4a0a6124592cb939fb40c4ea4 (diff) | |
vc4: Take precedence over ilo when in simulator mode.
They're exclusive at build time, but the ilo entry is always present, so
we'd try to use it and fail out.
v2: Add comment in the code, from Emil.
Cc: [email protected]
Reviewed-by: Emil Velikov <[email protected]>
(cherry picked from commit 1b62a4e885267c374dbbe5d5bb2c36515eee6a95)
| -rw-r--r-- | src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c index b5dfc56f49d..994a284385c 100644 --- a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c @@ -94,6 +94,18 @@ static const struct drm_driver_descriptor driver_descriptors[] = { .create_screen = pipe_i915_create_screen, .configuration = configuration_query, }, +#ifdef USE_VC4_SIMULATOR + /* VC4 simulator and ILO (i965) are mutually exclusive (error at + * configure). As the latter is unconditionally added, keep this one above + * it. + */ + { + .name = "i965", + .driver_name = "vc4", + .create_screen = pipe_vc4_create_screen, + .configuration = configuration_query, + }, +#endif { .name = "i965", .driver_name = "i915", @@ -154,14 +166,6 @@ static const struct drm_driver_descriptor driver_descriptors[] = { .create_screen = pipe_vc4_create_screen, .configuration = configuration_query, }, -#ifdef USE_VC4_SIMULATOR - { - .name = "i965", - .driver_name = "vc4", - .create_screen = pipe_vc4_create_screen, - .configuration = configuration_query, - }, -#endif }; #endif |