078277e4d9
This is a modified version of a patch we've been carry-ing in Fedora and RHEL for years now. This patch automatically adds secondary GPUs to the master as output sink / offload source making e.g. the use of slave-outputs just work, with requiring the user to manually run "xrandr --setprovideroutputsource" before he can hookup an external monitor to his hybrid graphics laptop. There is one problem with this patch, which is why it was not upstreamed before. What to do when a secondary GPU gets detected really is a policy decission (e.g. one may want to autobind PCI GPUs but not USB ones) and as such should be under control of the Desktop Environment. Unconditionally adding autobinding support to the xserver will result in races between the DE dealing with the hotplug of a secondary GPU and the server itself dealing with it. However we've waited for years for any Desktop Environments to actually start doing some sort of autoconfiguration of secondary GPUs and there is still not a single DE dealing with this, so I believe that it is time to upstream this now. To avoid potential future problems if any DEs get support for doing secondary GPU configuration themselves, the new autobind functionality is made optional. Since no DEs currently support doing this themselves it is enabled by default. When DEs grow support for doing this themselves they can disable the servers autobinding through the servers cmdline or a xorg.conf snippet. Signed-off-by: Dave Airlie <airlied@gmail.com> [hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream] Signed-off-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> --- Changes in v2: -Make the default enabled instead of installing a xorg.conf snippet which enables it unconditionally Changes in v3: -Handle GPUScreen autoconfig in randr/rrprovider.c, looking at rrScrPriv->provider, rather then in hw/xfree86/modes/xf86Crtc.c looking at xf86CrtcConfig->provider. This fixes the autoconfig not working with the nvidia binary driver
165 lines
5.4 KiB
C
165 lines
5.4 KiB
C
/*
|
|
* Copyright (c) 1997-2002 by The XFree86 Project, Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Except as contained in this notice, the name of the copyright holder(s)
|
|
* and author(s) shall not be used in advertising or otherwise to promote
|
|
* the sale, use or other dealings in this Software without prior written
|
|
* authorization from the copyright holder(s) and author(s).
|
|
*/
|
|
|
|
/*
|
|
* This file contains declarations for private XFree86 functions and variables,
|
|
* and definitions of private macros.
|
|
*
|
|
* "private" means not available to video drivers.
|
|
*/
|
|
|
|
#ifndef _XF86PRIV_H
|
|
#define _XF86PRIV_H
|
|
|
|
#include "xf86Privstr.h"
|
|
#include "propertyst.h"
|
|
#include "input.h"
|
|
|
|
/*
|
|
* Parameters set ONLY from the command line options
|
|
* The global state of these things is held in xf86InfoRec (when appropriate).
|
|
*/
|
|
extern _X_EXPORT const char *xf86ConfigFile;
|
|
extern _X_EXPORT const char *xf86ConfigDir;
|
|
extern _X_EXPORT Bool xf86AllowMouseOpenFail;
|
|
extern _X_EXPORT Bool xf86AutoBindGPUDisabled;
|
|
|
|
#ifdef XF86VIDMODE
|
|
extern _X_EXPORT Bool xf86VidModeDisabled;
|
|
extern _X_EXPORT Bool xf86VidModeAllowNonLocal;
|
|
#endif
|
|
extern _X_EXPORT Bool xf86fpFlag;
|
|
extern _X_EXPORT Bool xf86sFlag;
|
|
extern _X_EXPORT Bool xf86bsEnableFlag;
|
|
extern _X_EXPORT Bool xf86bsDisableFlag;
|
|
extern _X_EXPORT Bool xf86silkenMouseDisableFlag;
|
|
extern _X_EXPORT Bool xf86xkbdirFlag;
|
|
|
|
#ifdef HAVE_ACPI
|
|
extern _X_EXPORT Bool xf86acpiDisableFlag;
|
|
#endif
|
|
extern _X_EXPORT char *xf86LayoutName;
|
|
extern _X_EXPORT char *xf86ScreenName;
|
|
extern _X_EXPORT char *xf86PointerName;
|
|
extern _X_EXPORT char *xf86KeyboardName;
|
|
extern _X_EXPORT int xf86FbBpp;
|
|
extern _X_EXPORT int xf86Depth;
|
|
extern _X_EXPORT rgb xf86Weight;
|
|
extern _X_EXPORT Gamma xf86Gamma;
|
|
|
|
/* Other parameters */
|
|
|
|
extern _X_EXPORT xf86InfoRec xf86Info;
|
|
extern _X_EXPORT const char *xf86ModulePath;
|
|
extern _X_EXPORT MessageType xf86ModPathFrom;
|
|
extern _X_EXPORT const char *xf86LogFile;
|
|
extern _X_EXPORT MessageType xf86LogFileFrom;
|
|
extern _X_EXPORT Bool xf86LogFileWasOpened;
|
|
extern _X_EXPORT serverLayoutRec xf86ConfigLayout;
|
|
|
|
extern _X_EXPORT DriverPtr *xf86DriverList;
|
|
extern _X_EXPORT int xf86NumDrivers;
|
|
extern _X_EXPORT Bool xf86Resetting;
|
|
extern Bool xf86Initialising;
|
|
extern _X_EXPORT int xf86NumScreens;
|
|
extern _X_EXPORT const char *xf86VisualNames[];
|
|
extern _X_EXPORT int xf86Verbose; /* verbosity level */
|
|
extern _X_EXPORT int xf86LogVerbose; /* log file verbosity level */
|
|
|
|
extern _X_EXPORT ScrnInfoPtr *xf86GPUScreens; /* List of pointers to ScrnInfoRecs */
|
|
extern _X_EXPORT int xf86NumGPUScreens;
|
|
extern _X_EXPORT int xf86DRMMasterFd; /* Command line argument for DRM master file descriptor */
|
|
#ifndef DEFAULT_VERBOSE
|
|
#define DEFAULT_VERBOSE 0
|
|
#endif
|
|
#ifndef DEFAULT_LOG_VERBOSE
|
|
#define DEFAULT_LOG_VERBOSE 3
|
|
#endif
|
|
#ifndef DEFAULT_DPI
|
|
#define DEFAULT_DPI 96
|
|
#endif
|
|
|
|
/* Function Prototypes */
|
|
#ifndef _NO_XF86_PROTOTYPES
|
|
|
|
/* xf86Bus.c */
|
|
extern _X_EXPORT Bool xf86BusConfig(void);
|
|
extern _X_EXPORT void xf86BusProbe(void);
|
|
extern _X_EXPORT void xf86PostProbe(void);
|
|
extern _X_EXPORT void xf86ClearEntityListForScreen(ScrnInfoPtr pScrn);
|
|
extern _X_EXPORT void xf86AddDevToEntity(int entityIndex, GDevPtr dev);
|
|
extern _X_EXPORT void xf86RemoveDevFromEntity(int entityIndex, GDevPtr dev);
|
|
|
|
/* xf86Config.c */
|
|
|
|
extern _X_EXPORT Bool xf86PathIsSafe(const char *path);
|
|
|
|
/* xf86DefaultModes */
|
|
|
|
extern _X_EXPORT const DisplayModeRec xf86DefaultModes[];
|
|
extern _X_EXPORT const int xf86NumDefaultModes;
|
|
|
|
/* xf86Configure.c */
|
|
extern _X_EXPORT void
|
|
DoConfigure(void)
|
|
_X_NORETURN;
|
|
extern _X_EXPORT void
|
|
DoShowOptions(void)
|
|
_X_NORETURN;
|
|
|
|
/* xf86Events.c */
|
|
|
|
extern _X_EXPORT void
|
|
xf86Wakeup(void *blockData, int err);
|
|
extern _X_EXPORT void
|
|
xf86HandlePMEvents(int fd, void *data);
|
|
extern _X_EXPORT int (*xf86PMGetEventFromOs) (int fd, pmEvent * events,
|
|
int num);
|
|
extern _X_EXPORT pmWait (*xf86PMConfirmEventToOs) (int fd, pmEvent event);
|
|
|
|
/* xf86Helper.c */
|
|
extern _X_EXPORT void
|
|
xf86LogInit(void);
|
|
extern _X_EXPORT void
|
|
xf86CloseLog(enum ExitCode error);
|
|
|
|
/* xf86Init.c */
|
|
extern _X_EXPORT Bool
|
|
xf86LoadModules(const char **list, void **optlist);
|
|
extern _X_EXPORT int
|
|
xf86SetVerbosity(int verb);
|
|
extern _X_EXPORT int
|
|
xf86SetLogVerbosity(int verb);
|
|
extern _X_EXPORT Bool
|
|
xf86CallDriverProbe(struct _DriverRec *drv, Bool detect_only);
|
|
extern _X_EXPORT Bool
|
|
xf86PrivsElevated(void);
|
|
|
|
#endif /* _NO_XF86_PROTOTYPES */
|
|
|
|
#endif /* _XF86PRIV_H */
|