From 4c3763445ddc83d75b7e77c33aa5b1871fe550b7 Mon Sep 17 00:00:00 2001 From: Xin LI Date: Fri, 10 Jun 2005 05:20:33 +0000 Subject: [PATCH] Only set mode when the incoming ioctl is IOC_VOID, until we have better solution against the ioctl collisions. Submitted by: Antoine Brodin PR: kern/81867 --- sys/dev/syscons/scvesactl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c index b54f61bd17f..a39bf483d7e 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); }