frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

randr: Check rrPrivKey before autobinding GPU screens 

RRProviderAutoConfigGpuScreen() is called from outside RandR, so there is no
guarantee that RandR has been initialized when it is called.

As mentioned in commit 4226c6d, it's possible that RandR has not been
initialized if the server is configured with Xinerama and there is more than one
X screen. Calling rrGetScrPriv when RandR isn't initialized causes an assertion
failure that aborts the server:

  Xorg: ../include/privates.h:121: dixGetPrivateAddr: Assertion
  key->initialized' failed.

Just as in commit 4226c6d, fix the problem by checking
dixPrivateKeyRegistered(rrPrivKey) before calling rrGetScrPriv.

Signed-off-by: Alex Goins <agoins@nvidia.com>
This commit is contained in:
Alex Goins 2020-07-02 18:39:11 -05:00
parent e33453f911
commit 6172bd2b41
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
randr/rrprovider.c
View File

@ -490,10 +490,20 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider)
void void
RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr primaryScreen) RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr primaryScreen)
{ {
rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen); rrScrPrivPtr pScrPriv;
rrScrPrivPtr primaryPriv = rrGetScrPriv(primaryScreen); rrScrPrivPtr primaryPriv;
RRProviderPtr provider = pScrPriv->provider; RRProviderPtr provider;
RRProviderPtr primary_provider = primaryPriv->provider; RRProviderPtr primary_provider;
/* Bail out if RandR wasn't initialized. */
if (!dixPrivateKeyRegistered(rrPrivKey))
return;
pScrPriv = rrGetScrPriv(pScreen);
primaryPriv = rrGetScrPriv(primaryScreen);
provider = pScrPriv->provider;
primary_provider = primaryPriv->provider;
if (!provider || !primary_provider) if (!provider || !primary_provider)
return; return;