andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fbdevhw: Disable FBIOBLANK ioctl if not supported

Browse Source 
Some ioctls may not be supported by the kernel however their failure
is non-fatal to the driver. Unfortunately we only know once we try
to execute the ioctl however the sematics of the fbdev driver API
doesn't allow upper layers to disable the call.
Instead of changing the fbdevHW driver API just disable the call to
this ioctl on the module level when detecting such a case.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Egbert Eich <eich@freedesktop.org>
This commit is contained in:
Egbert Eich 2013-10-05 13:57:13 +02:00 committed by Adam Jackson
parent 49fe4ee7b7
commit 5437949a51
1 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,8 +76,14 @@ typedef struct {
/* buildin video mode */
DisplayModeRec buildin;
/* disable non-fatal unsupported ioctls */
CARD32 unsupported_ioctls;
} fbdevHWRec, *fbdevHWPtr;
enum {
FBIOBLANK_UNSUPPORTED = 0,
};
Bool
fbdevHWGetRec(ScrnInfoPtr pScrn)
{
@ -831,6 +837,9 @@ fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags)
if (!pScrn->vtSema)
return;
if (fPtr->unsupported_ioctls & (1 << FBIOBLANK_UNSUPPORTED))
return;
switch (mode) {
case DPMSModeOn:
fbmode = 0;
@ -848,9 +857,23 @@ fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags)
return;
}
if (-1 == ioctl(fPtr->fd, FBIOBLANK, (void *) fbmode))
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"FBIOBLANK: %s\n", strerror(errno));
RETRY:
if (-1 == ioctl(fPtr->fd, FBIOBLANK, (void *) fbmode)) {
switch (errno) {
case EAGAIN:
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"FBIOBLANK: %s\n", strerror(errno));
break;
case EINTR:
case ERESTART:
goto RETRY;
default:
fPtr->unsupported_ioctls |= (1 << FBIOBLANK_UNSUPPORTED);
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"FBIOBLANK: %s (Screen blanking not supported "
"by kernel - disabling)\n", strerror(errno));
}
}
}
Bool
@ -863,11 +886,27 @@ fbdevHWSaveScreen(ScreenPtr pScreen, int mode)
if (!pScrn->vtSema)
return TRUE;
if (fPtr->unsupported_ioctls & (1 << FBIOBLANK_UNSUPPORTED))
return FALSE;
unblank = xf86IsUnblank(mode);
RETRY:
if (-1 == ioctl(fPtr->fd, FBIOBLANK, (void *) (1 - unblank))) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"FBIOBLANK: %s\n", strerror(errno));
switch (errno) {
case EAGAIN:
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"FBIOBLANK: %s\n", strerror(errno));
break;
case EINTR:
case ERESTART:
goto RETRY;
default:
fPtr->unsupported_ioctls |= (1 << FBIOBLANK_UNSUPPORTED);
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"FBIOBLANK: %s (Screen blanking not supported "
"by kernel - disabling)\n", strerror(errno));
}
return FALSE;
}