summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2005-06-10 05:20:33 +0000
committerdelphij <delphij@FreeBSD.org>2005-06-10 05:20:33 +0000
commit508e67396ea922c5e3249f730d7004fa6edba0b2 (patch)
tree1aeb26698405b64429ab6aaadd78edea7a5e82ac
parent836efd552e56047859181234a26b790d7b2094a0 (diff)
downloadFreeBSD-src-508e67396ea922c5e3249f730d7004fa6edba0b2.zip
FreeBSD-src-508e67396ea922c5e3249f730d7004fa6edba0b2.tar.gz
Only set mode when the incoming ioctl is IOC_VOID, until we have better
solution against the ioctl collisions. Submitted by: Antoine Brodin <antoine.brodin at laposte net> PR: kern/81867
-rw-r--r--sys/dev/syscons/scvesactl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c
index b54f61b..a39bf48 100644
--- a/sys/dev/syscons/scvesactl.c
+++ b/sys/dev/syscons/scvesactl.c
@@ -115,7 +115,9 @@ vesa_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *
mode = (cmd & 0xff) + M_VESA_BASE;
- if ((mode > M_VESA_FULL_1280) &&
+ /* Only set graphics mode in non-pcvt case */
+ if (((cmd & IOC_DIRMASK) == IOC_VOID) &&
+ (mode > M_VESA_FULL_1280) &&
(mode < M_VESA_MODE_MAX))
return sc_set_graphics_mode(scp, tp, mode);
}
OpenPOWER on IntegriCloud