XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-25 12:49:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fbdevhw: Restore accel flags when unmapping mmio

Browse Source 
Signed-off-by: stefan11111 <stefan11111@shitposting.expert>
This commit is contained in:
stefan11111
2025-09-20 12:08:07 +03:00
committed by Enrico Weigelt
parent e3aff38742
commit f252e04a78
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
hw/xfree86/fbdevhw/fbdevhw.c
View File

@@ -79,6 +79,7 @@ typedef struct {
/* saved video mode */
struct fb_var_screeninfo saved_var;
uint32_t saved_accel;
/* buildin video mode */
DisplayModeRec buildin;
@@ -726,6 +727,7 @@ fbdevHWMapMMIO(ScrnInfoPtr pScrn)
if (NULL == fPtr->mmio) {
/* tell the kernel not to use accels to speed up console scrolling */
fPtr->saved_accel = fPtr->var.accel_flags;
fPtr->var.accel_flags = 0;
if (0 != ioctl(fPtr->fd, FBIOPUT_VSCREENINFO, (void *) (&fPtr->var))) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -762,7 +764,12 @@ fbdevHWUnmapMMIO(ScrnInfoPtr pScrn)
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "munmap mmio: %s\n",
strerror(errno));
fPtr->mmio = NULL;
/* FIXME: restore var.accel_flags [geert] */
fPtr->var.accel_flags = fPtr->saved_accel;
if (0 != ioctl(fPtr->fd, FBIOPUT_VSCREENINFO, (void *) (&fPtr->var))) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"FBIOPUT_VSCREENINFO: %s\n", strerror(errno));
return FALSE;
}
}
return TRUE;
}