diff options
| author | Søren Sandmann Pedersen <ssp@localhost.localdomain> | 2011-08-21 10:11:48 -0400 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@redhat.com> | 2011-08-22 10:30:14 -0400 |
| commit | b89a0b11b1133bf2991580203867830747ad4de1 (patch) | |
| tree | 3658d9ceeea97304bdf7c61c529f66cf35fe72ea | |
| parent | 4a040532492b212e05f5375994adcfdd171e0410 (diff) | |
Only save the VGA fonts for the primary device.
Otherwise, if we try to save the VGA fonts when initializing a
non-primary device, the saving will be routed to the primary one
putting it into VGA mode, which then locks up.
| -rw-r--r-- | src/qxl_driver.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qxl_driver.c b/src/qxl_driver.c index f3768f7..428735a 100644 --- a/src/qxl_driver.c +++ b/src/qxl_driver.c @@ -409,7 +409,8 @@ qxl_save_state(ScrnInfoPtr pScrn) { qxl_screen_t *qxl = pScrn->driverPrivate; - vgaHWSaveFonts(pScrn, &qxl->vgaRegs); + if (xf86IsPrimaryPci (qxl->pci)) + vgaHWSaveFonts(pScrn, &qxl->vgaRegs); } static void @@ -417,7 +418,8 @@ qxl_restore_state(ScrnInfoPtr pScrn) { qxl_screen_t *qxl = pScrn->driverPrivate; - vgaHWRestoreFonts(pScrn, &qxl->vgaRegs); + if (xf86IsPrimaryPci (qxl->pci)) + vgaHWRestoreFonts(pScrn, &qxl->vgaRegs); } #endif /* XSPICE */ |