qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add more luna88k-specific initialization to use color wscons and

Browse Source 
monochrome X server both.

Now OpenBSD/luna88k kernel supports color wscons on 4/8bpp frame
buffer, but X server only supports 1bpp (monochrome) for now.  So
change `pseudo' depth by WSDISPLAYIO_SETGFXMODE ioctl while X server
is running.
This commit is contained in:
aoyama 2014-01-15 11:15:59 +00:00
parent 5104442c40
commit 8722ac84a6
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
driver/xf86-video-wsfb/src/wsfb_driver.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: wsfb_driver.c,v 1.30 2013/07/15 13:23:17 aoyama Exp $ */
/* $OpenBSD: wsfb_driver.c,v 1.31 2014/01/15 11:15:59 aoyama Exp $ */
/*
* Copyright © 2001-2012 Matthieu Herrb
* All rights reserved.
@ -531,6 +531,22 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags)
strerror(errno));
return FALSE;
}
/* Quirk for LUNA: now X supports 1bpp only, so force to set 1bpp */
if (fPtr->wstype == WSDISPLAY_TYPE_LUNA) {
struct wsdisplay_gfx_mode gfxmode;
gfxmode.width = fPtr->info.width;
gfxmode.height = fPtr->info.height;
gfxmode.depth = fPtr->info.depth = 1;
if (ioctl(fPtr->fd, WSDISPLAYIO_SETGFXMODE, &gfxmode) == -1) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"ioctl WSDISPLAY_SETGFXMODE: %s\n",
strerror(errno));
return FALSE;
}
}
/*
* Allocate room for saving the colormap.
*/
@ -1335,6 +1351,21 @@ WsfbRestore(ScrnInfoPtr pScrn)
/* Clear the screen. */
memset(fPtr->fbmem, 0, fPtr->fbmem_len);
/* Quirk for LUNA: Restore default depth. */
if (fPtr->wstype == WSDISPLAY_TYPE_LUNA) {
struct wsdisplay_gfx_mode gfxmode;
gfxmode.width = fPtr->info.width;
gfxmode.height = fPtr->info.height;
gfxmode.depth = 0; /* set to default depth */
if (ioctl(fPtr->fd, WSDISPLAYIO_SETGFXMODE, &gfxmode) == -1) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"ioctl WSDISPLAY_SETGFXMODE: %s\n",
strerror(errno));
return FALSE;
}
}
/* Restore the text mode. */
mode = WSDISPLAYIO_MODE_EMUL;
if (ioctl(fPtr->fd, WSDISPLAYIO_SMODE, &mode) == -1) {