diff options
| author | Adam Jackson <ajax@redhat.com> | 2018-01-24 15:24:00 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-01-24 15:24:00 -0500 |
| commit | 5cb330cd5d887b20351604ac080e8b71a4e28be7 (patch) | |
| tree | 340c5878c6a43a077e5518cdda664355fb33001c /hw/xfree86/common/xf86Init.c | |
| parent | c08d7c1cdde6a844338ed4c3645b00bf25843a31 (diff) | |
Revert "xfree86: Remove broken RANDR disabling logic (v3)"
Tsk. This broke vesa for me, the rrGetScrPriv in InitOutput will crash
if randr's screen private key hasn't been initialized yet. That seems
dumb, but let's not leave it broken.
This reverts commit c08d7c1cdde6a844338ed4c3645b00bf25843a31.
Diffstat (limited to 'hw/xfree86/common/xf86Init.c')
| -rw-r--r-- | hw/xfree86/common/xf86Init.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 66dcd52fa..57b38d07e 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -77,7 +77,6 @@ #include "xf86Xinput.h" #include "xf86InPriv.h" #include "picturestr.h" -#include "randrstr.h" #include "xf86Bus.h" #ifdef XSERVER_LIBPCIACCESS @@ -811,12 +810,10 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) SubPixelUnknown); } #ifdef RANDR - /* - * If the driver hasn't set up its own RANDR support, install the - * fallback support. - */ - if (!rrGetScrPriv(xf86Screens[i]->pScreen)) + if (!xf86Info.disableRandR) xf86RandRInit(screenInfo.screens[scr_index]); + xf86Msg(xf86Info.randRFrom, "RandR %s\n", + xf86Info.disableRandR ? "disabled" : "enabled"); #endif } |