aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/drm2/drm_fb_helper.c12
-rw-r--r--sys/dev/drm2/radeon/radeon_fb.c2
-rw-r--r--sys/dev/fb/fbd.c2
-rw-r--r--sys/dev/vt/hw/fb/vt_fb.c18
-rw-r--r--sys/dev/vt/hw/fb/vt_fb.h2
-rw-r--r--sys/dev/vt/hw/vga/vt_vga.c4
-rw-r--r--sys/dev/vt/vt.h9
-rw-r--r--sys/dev/vt/vt_core.c113
-rw-r--r--sys/sys/fbio.h3
9 files changed, 134 insertions, 31 deletions
diff --git a/sys/dev/drm2/drm_fb_helper.c b/sys/dev/drm2/drm_fb_helper.c
index 562bf82f5558..e56dce7f1f0c 100644
--- a/sys/dev/drm2/drm_fb_helper.c
+++ b/sys/dev/drm2/drm_fb_helper.c
@@ -937,19 +937,21 @@ int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
info->fb_priv = sc;
info->enter = &vt_kms_postswitch;
+ kdev = fb_helper->dev->device;
+ info->fb_video_dev = device_get_parent(kdev);
+
/* set the fb pointer */
for (i = 0; i < fb_helper->crtc_count; i++) {
fb_helper->crtc_info[i].mode_set.fb = fb_helper->fb;
}
if (new_fb) {
- device_t fbd;
int ret;
- kdev = fb_helper->dev->device;
- fbd = device_add_child(kdev, "fbd", device_get_unit(kdev));
- if (fbd != NULL)
- ret = device_probe_and_attach(fbd);
+ info->fb_fbd_dev = device_add_child(kdev, "fbd",
+ device_get_unit(kdev));
+ if (info->fb_fbd_dev != NULL)
+ ret = device_probe_and_attach(info->fb_fbd_dev);
else
ret = ENODEV;
#ifdef DEV_VT
diff --git a/sys/dev/drm2/radeon/radeon_fb.c b/sys/dev/drm2/radeon/radeon_fb.c
index d4b24a34dec6..7b976b661949 100644
--- a/sys/dev/drm2/radeon/radeon_fb.c
+++ b/sys/dev/drm2/radeon/radeon_fb.c
@@ -291,6 +291,8 @@ static int radeon_fbdev_destroy(struct drm_device *dev, struct radeon_fbdev *rfb
if (rfbdev->helper.fbdev) {
info = rfbdev->helper.fbdev;
+ if (info->fb_fbd_dev != NULL)
+ device_delete_child(dev->device, info->fb_fbd_dev);
free(info->fb_priv, DRM_MEM_KMS);
free(info, DRM_MEM_KMS);
}
diff --git a/sys/dev/fb/fbd.c b/sys/dev/fb/fbd.c
index f9b4d8e56c6b..6b7b7316bf57 100644
--- a/sys/dev/fb/fbd.c
+++ b/sys/dev/fb/fbd.c
@@ -263,6 +263,8 @@ fbd_unregister(struct fb_info* info)
LIST_FOREACH_SAFE(entry, &fb_list_head, fb_list, tmp) {
if (entry->fb_info == info) {
LIST_REMOVE(entry, fb_list);
+ if (LIST_EMPTY(&fb_list_head))
+ vt_fb_detach(info);
free(entry, M_DEVBUF);
return (0);
}
diff --git a/sys/dev/vt/hw/fb/vt_fb.c b/sys/dev/vt/hw/fb/vt_fb.c
index 5a0fe4f24854..5d38cc7dea0d 100644
--- a/sys/dev/vt/hw/fb/vt_fb.c
+++ b/sys/dev/vt/hw/fb/vt_fb.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
static struct vt_driver vt_fb_driver = {
.vd_name = "fb",
.vd_init = vt_fb_init,
+ .vd_fini = vt_fb_fini,
.vd_blank = vt_fb_blank,
.vd_bitblt_text = vt_fb_bitblt_text,
.vd_bitblt_bmp = vt_fb_bitblt_bitmap,
@@ -419,6 +420,7 @@ vt_fb_init(struct vt_device *vd)
info = vd->vd_softc;
vd->vd_height = info->fb_height;
vd->vd_width = info->fb_width;
+ vd->vd_video_dev = info->fb_video_dev;
if (info->fb_size == 0)
return (CN_DEAD);
@@ -442,6 +444,13 @@ vt_fb_init(struct vt_device *vd)
return (CN_INTERNAL);
}
+void
+vt_fb_fini(struct vt_device *vd, void *softc)
+{
+
+ vd->vd_video_dev = NULL;
+}
+
int
vt_fb_attach(struct fb_info *info)
{
@@ -451,6 +460,15 @@ vt_fb_attach(struct fb_info *info)
return (0);
}
+int
+vt_fb_detach(struct fb_info *info)
+{
+
+ vt_deallocate(&vt_fb_driver, info);
+
+ return (0);
+}
+
void
vt_fb_suspend(struct vt_device *vd)
{
diff --git a/sys/dev/vt/hw/fb/vt_fb.h b/sys/dev/vt/hw/fb/vt_fb.h
index ac18cff49e36..98ecefa77f6c 100644
--- a/sys/dev/vt/hw/fb/vt_fb.h
+++ b/sys/dev/vt/hw/fb/vt_fb.h
@@ -35,8 +35,10 @@
int vt_fb_attach(struct fb_info *info);
void vt_fb_resume(struct vt_device *vd);
void vt_fb_suspend(struct vt_device *vd);
+int vt_fb_detach(struct fb_info *info);
vd_init_t vt_fb_init;
+vd_fini_t vt_fb_fini;
vd_blank_t vt_fb_blank;
vd_bitblt_text_t vt_fb_bitblt_text;
vd_bitblt_bmp_t vt_fb_bitblt_bitmap;
diff --git a/sys/dev/vt/hw/vga/vt_vga.c b/sys/dev/vt/hw/vga/vt_vga.c
index 43bad8e9a91b..e939fdd126f6 100644
--- a/sys/dev/vt/hw/vga/vt_vga.c
+++ b/sys/dev/vt/hw/vga/vt_vga.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
#include <dev/vt/vt.h>
#include <dev/vt/hw/vga/vt_vga_reg.h>
+#include <dev/pci/pcivar.h>
#include <machine/bus.h>
@@ -1213,6 +1214,9 @@ vga_init(struct vt_device *vd)
sc = vd->vd_softc;
textmode = 0;
+ if (vd->vd_flags & VDF_DOWNGRADE && vd->vd_video_dev != NULL)
+ vga_pci_repost(vd->vd_video_dev);
+
#if defined(__amd64__) || defined(__i386__)
sc->vga_fb_tag = X86_BUS_SPACE_MEM;
sc->vga_fb_handle = KERNBASE + VGA_MEM_BASE;
diff --git a/sys/dev/vt/vt.h b/sys/dev/vt/vt.h
index 0ad8ab5dffda..85c034524c40 100644
--- a/sys/dev/vt/vt.h
+++ b/sys/dev/vt/vt.h
@@ -89,7 +89,8 @@ SYSCTL_INT(_kern_vt, OID_AUTO, _name, CTLFLAG_RWTUN, &vt_##_name, _default,\
struct vt_driver;
-void vt_allocate(struct vt_driver *, void *);
+void vt_allocate(const struct vt_driver *, void *);
+void vt_deallocate(const struct vt_driver *, void *);
typedef unsigned int vt_axis_t;
@@ -124,6 +125,9 @@ struct vt_device {
struct vt_pastebuf vd_pastebuf; /* (?) Copy/paste buf. */
const struct vt_driver *vd_driver; /* (c) Graphics driver. */
void *vd_softc; /* (u) Driver data. */
+ const struct vt_driver *vd_prev_driver;/* (?) Previous driver. */
+ void *vd_prev_softc; /* (?) Previous driver data. */
+ device_t vd_video_dev; /* (?) Video adapter. */
#ifndef SC_NO_CUTPASTE
struct vt_mouse_cursor *vd_mcursor; /* (?) Cursor bitmap. */
term_color_t vd_mcursor_fg; /* (?) Cursor fg color. */
@@ -150,6 +154,7 @@ struct vt_device {
#define VDF_INITIALIZED 0x20 /* vtterm_cnprobe already done. */
#define VDF_MOUSECURSOR 0x40 /* Mouse cursor visible. */
#define VDF_QUIET_BELL 0x80 /* Disable bell. */
+#define VDF_DOWNGRADE 0x8000 /* The driver is being downgraded. */
int vd_keyboard; /* (G) Keyboard index. */
unsigned int vd_kbstate; /* (?) Device unit. */
unsigned int vd_unit; /* (c) Device unit. */
@@ -301,6 +306,7 @@ struct vt_window {
typedef int vd_init_t(struct vt_device *vd);
typedef int vd_probe_t(struct vt_device *vd);
+typedef void vd_fini_t(struct vt_device *vd, void *softc);
typedef void vd_postswitch_t(struct vt_device *vd);
typedef void vd_blank_t(struct vt_device *vd, term_color_t color);
typedef void vd_bitblt_text_t(struct vt_device *vd, const struct vt_window *vw,
@@ -323,6 +329,7 @@ struct vt_driver {
/* Console attachment. */
vd_probe_t *vd_probe;
vd_init_t *vd_init;
+ vd_fini_t *vd_fini;
/* Drawing. */
vd_blank_t *vd_blank;
diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c
index 962784939d07..1f8731e275a3 100644
--- a/sys/dev/vt/vt_core.c
+++ b/sys/dev/vt/vt_core.c
@@ -180,6 +180,8 @@ static struct vt_window vt_conswindow;
static struct vt_device vt_consdev = {
.vd_driver = NULL,
.vd_softc = NULL,
+ .vd_prev_driver = NULL,
+ .vd_prev_softc = NULL,
.vd_flags = VDF_INVALID,
.vd_windows = { [VT_CONSWINDOW] = &vt_conswindow, },
.vd_curwindow = &vt_conswindow,
@@ -2598,31 +2600,11 @@ vt_resize(struct vt_device *vd)
}
}
-void
-vt_allocate(struct vt_driver *drv, void *softc)
+static void
+vt_replace_backend(const struct vt_driver *drv, void *softc)
{
struct vt_device *vd;
- if (!vty_enabled(VTY_VT))
- return;
-
- if (main_vd->vd_driver == NULL) {
- main_vd->vd_driver = drv;
- printf("VT: initialize with new VT driver \"%s\".\n",
- drv->vd_name);
- } else {
- /*
- * Check if have rights to replace current driver. For example:
- * it is bad idea to replace KMS driver with generic VGA one.
- */
- if (drv->vd_priority <= main_vd->vd_driver->vd_priority) {
- printf("VT: Driver priority %d too low. Current %d\n ",
- drv->vd_priority, main_vd->vd_driver->vd_priority);
- return;
- }
- printf("VT: Replacing driver \"%s\" with new \"%s\".\n",
- main_vd->vd_driver->vd_name, drv->vd_name);
- }
vd = main_vd;
if (vd->vd_flags & VDF_ASYNC) {
@@ -2644,9 +2626,44 @@ vt_allocate(struct vt_driver *drv, void *softc)
VT_LOCK(vd);
vd->vd_flags &= ~VDF_TEXTMODE;
- vd->vd_driver = drv;
- vd->vd_softc = softc;
- vd->vd_driver->vd_init(vd);
+ if (drv != NULL) {
+ /*
+ * We want to upgrade from the current driver to the
+ * given driver.
+ */
+
+ vd->vd_prev_driver = vd->vd_driver;
+ vd->vd_prev_softc = vd->vd_softc;
+ vd->vd_driver = drv;
+ vd->vd_softc = softc;
+
+ vd->vd_driver->vd_init(vd);
+ } else if (vd->vd_prev_driver != NULL && vd->vd_prev_softc != NULL) {
+ /*
+ * No driver given: we want to downgrade to the previous
+ * driver.
+ */
+ const struct vt_driver *old_drv;
+ void *old_softc;
+
+ old_drv = vd->vd_driver;
+ old_softc = vd->vd_softc;
+
+ vd->vd_driver = vd->vd_prev_driver;
+ vd->vd_softc = vd->vd_prev_softc;
+ vd->vd_prev_driver = NULL;
+ vd->vd_prev_softc = NULL;
+
+ vd->vd_flags |= VDF_DOWNGRADE;
+
+ vd->vd_driver->vd_init(vd);
+
+ if (old_drv->vd_fini)
+ old_drv->vd_fini(vd, old_softc);
+
+ vd->vd_flags &= ~VDF_DOWNGRADE;
+ }
+
VT_UNLOCK(vd);
/* Update windows sizes and initialize last items. */
@@ -2692,6 +2709,52 @@ vt_resume_handler(void *priv)
}
void
+vt_allocate(const struct vt_driver *drv, void *softc)
+{
+
+ if (!vty_enabled(VTY_VT))
+ return;
+
+ if (main_vd->vd_driver == NULL) {
+ main_vd->vd_driver = drv;
+ printf("VT: initialize with new VT driver \"%s\".\n",
+ drv->vd_name);
+ } else {
+ /*
+ * Check if have rights to replace current driver. For example:
+ * it is bad idea to replace KMS driver with generic VGA one.
+ */
+ if (drv->vd_priority <= main_vd->vd_driver->vd_priority) {
+ printf("VT: Driver priority %d too low. Current %d\n ",
+ drv->vd_priority, main_vd->vd_driver->vd_priority);
+ return;
+ }
+ printf("VT: Replacing driver \"%s\" with new \"%s\".\n",
+ main_vd->vd_driver->vd_name, drv->vd_name);
+ }
+
+ vt_replace_backend(drv, softc);
+}
+
+void
+vt_deallocate(const struct vt_driver *drv, void *softc)
+{
+
+ if (!vty_enabled(VTY_VT))
+ return;
+
+ if (main_vd->vd_prev_driver == NULL ||
+ main_vd->vd_driver != drv ||
+ main_vd->vd_softc != softc)
+ return;
+
+ printf("VT: Switching back from \"%s\" to \"%s\".\n",
+ main_vd->vd_driver->vd_name, main_vd->vd_prev_driver->vd_name);
+
+ vt_replace_backend(NULL, NULL);
+}
+
+void
vt_suspend(struct vt_device *vd)
{
int error;
diff --git a/sys/sys/fbio.h b/sys/sys/fbio.h
index 034d05293904..17cd891d3985 100644
--- a/sys/sys/fbio.h
+++ b/sys/sys/fbio.h
@@ -128,6 +128,9 @@ struct fb_info {
struct cdev *fb_cdev;
+ device_t fb_fbd_dev; /* "fbd" device. */
+ device_t fb_video_dev; /* Video adapter. */
+
fb_enter_t *enter;
fb_leave_t *leave;
fb_setblankmode_t *setblankmode;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 05:40:33 +0000