mirror of
https://github.com/X11Libre/xserver.git
synced 2026-11-12 04:55:49 +00:00
xfree86/common: hide a variable behind XSERVER_LIBPCIACESS
Some checks failed
Build X servers / xserver-build-ubuntu (push) Has been cancelled
Build X servers / drivers-build-ubuntu (push) Has been cancelled
Build X servers / xserver-build-mingw32-ubuntu (push) Has been cancelled
Build X servers / xserver-build-macos (push) Has been cancelled
Build X servers / xserver-build-freebsd (push) Has been cancelled
Build X servers / xserver-build-dragonflybsd (push) Has been cancelled
Build X servers / xserver-build-netbsd (push) Has been cancelled
check PRs for merge conflicts / notify (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_timeout (push) Has been cancelled
delete old workflow runs / purge_deleted_branch_workflows (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (maint-25.0) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (master) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/AllocColor) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/ReplyNotSwappd) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/XvPortNotifyPtr) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/always-pciaccess) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/build-rootless) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/char-subscr) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/clang-tidy) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/cleanup) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/cleanup-api-xfree86) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/cleanup-api-xfree86-backup) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/cleanup-grabs) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/cleanup-os-export) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/client_array) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/conv-warnings) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/dix-config) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/dixconf-1) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/dixgetproperty) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/fmt) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/generations) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/geode) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/github-build) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/github-macos-deps) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/github-releases) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/glx_deferred) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/grouping) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/includes) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/includes-2) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/intel-2) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/io) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/log_req_len) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/logging) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/logging_submitted_1) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/maint-xnest) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/marshal) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/matrix-test) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/meson) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/misc.h) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/mpbt) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/netbsd) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/no-libsystemd) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/optional-pci) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/os-unexport) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/pciaccess) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/pedantic) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/pixmap-lifecycle) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/reallocarray) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/requests) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/screenproc) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/screenproc-wrap) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/swap0) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/swapping) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/swapping_new) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/warn-conv) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/win32_2) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/xcb-marshal) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/xf86_platform_bus_newabi) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/xf86bigfont) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/xi-properties) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/xnest-render) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/xnest-rootless) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/xnest-shm) (push) Has been cancelled
Build X servers / Release pushed tag (push) Has been cancelled
Some checks failed
Build X servers / xserver-build-ubuntu (push) Has been cancelled
Build X servers / drivers-build-ubuntu (push) Has been cancelled
Build X servers / xserver-build-mingw32-ubuntu (push) Has been cancelled
Build X servers / xserver-build-macos (push) Has been cancelled
Build X servers / xserver-build-freebsd (push) Has been cancelled
Build X servers / xserver-build-dragonflybsd (push) Has been cancelled
Build X servers / xserver-build-netbsd (push) Has been cancelled
check PRs for merge conflicts / notify (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_timeout (push) Has been cancelled
delete old workflow runs / purge_deleted_branch_workflows (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (maint-25.0) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (master) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/AllocColor) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/ReplyNotSwappd) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/XvPortNotifyPtr) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/always-pciaccess) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/build-rootless) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/char-subscr) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/clang-tidy) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/cleanup) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/cleanup-api-xfree86) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/cleanup-api-xfree86-backup) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/cleanup-grabs) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/cleanup-os-export) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/client_array) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/conv-warnings) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/dix-config) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/dixconf-1) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/dixgetproperty) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/fmt) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/generations) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/geode) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/github-build) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/github-macos-deps) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/github-releases) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/glx_deferred) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/grouping) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/includes) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/includes-2) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/intel-2) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/io) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/log_req_len) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/logging) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/logging_submitted_1) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/maint-xnest) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/marshal) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/matrix-test) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/meson) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/misc.h) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/mpbt) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/netbsd) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/no-libsystemd) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/optional-pci) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/os-unexport) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/pciaccess) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/pedantic) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/pixmap-lifecycle) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/reallocarray) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/requests) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/screenproc) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/screenproc-wrap) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/swap0) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/swapping) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/swapping_new) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/warn-conv) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/win32_2) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/xcb-marshal) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/xf86_platform_bus_newabi) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/xf86bigfont) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/xi-properties) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/xnest-render) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/xnest-rootless) (push) Has been cancelled
delete old workflow runs / delete_old_workflow_runs_branches (wip/xnest-shm) (push) Has been cancelled
Build X servers / Release pushed tag (push) Has been cancelled
A variable pci_other is declared and can be used only on libpciacceess builds. Fixes: https://github.com/X11Libre/xserver/issues/1713 Signed-off-by: Oleh Nykyforchyn <oleh.nyk@gmail.com>
This commit is contained in:
parent
ccb9b1bd17
commit
ec49f5d24a
1 changed files with 4 additions and 2 deletions
|
|
@ -821,10 +821,12 @@ xf86CheckSlot(const void *ptr, BusType type)
|
|||
if (!strcasecmp(pent->driver->driverName, "modesetting")) {
|
||||
/* Examine the first device only */
|
||||
msOther = xf86FindOptionValue(pent->devices[0]->options, "kmsdev");
|
||||
if ((msOther == NULL) && (pci_other == NULL)) {
|
||||
if (msOther == NULL)
|
||||
#ifdef XSERVER_LIBPCIACCESS
|
||||
if (pci_other == NULL)
|
||||
#endif
|
||||
/* Autoconfigured */
|
||||
msOther = "/dev/dri/card0";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue