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: mesa-stable@lists.freedesktop.org Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user