three qemu patches (bochs/cirrus drivers)
Subsystems (2)
cover three qemu patches (bochs/cirrus drivers)
Hi,
Resending three patches for qemu emulated hardware. One little cleanup, and two adding power management callbacks to bochs and cirrus drivers, so you have working video after resuming your virtual machine from S3.
I've already sent them months ago, nobody raised any concerns and I've assumed they where scheduled for 3.15. They didn't show up in 3.15-rc1 though. Any chance they can still make 3.15?
thanks,
Gerd
Gerd Hoffmann (3):
drm: cirrus: add power management support
drm: bochs: add power management support
drm: bochs: drop unused struct fields
drivers/gpu/drm/bochs/bochs.h | 3 +-- drivers/gpu/drm/bochs/bochs_drv.c | 44 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/bochs/bochs_fbdev.c | 1 - drivers/gpu/drm/cirrus/cirrus_drv.c | 42 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/cirrus/cirrus_mode.c | 3 +++ 5 files changed, 90 insertions(+), 3 deletions(-)
Signature · 1 line
1.8.3.1
PATCH 1/3 drm: cirrus: add power management support
cirrus kms driver lacks power management support, thus the vga display doesn't work any more after S3 resume.
Fix this by adding suspend and resume functions. Also make the mode_set function unblank the screen.
--- drivers/gpu/drm/cirrus/cirrus_drv.c | 42 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/cirrus/cirrus_mode.c | 3 +++ 2 files changed, 45 insertions(+)
drivers/gpu/drm/cirrus/cirrus_drv.c +42 -0
@@ -11,6 +11,7 @@#include <linux/module.h> #include <linux/console.h> #include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include "cirrus_drv.h"
@@ -75,6 +76,41 @@ static void cirrus_pci_remove(struct pci_dev *pdev)drm_put_dev (dev); } +static int cirrus_pm_suspend (struct device *dev) +{ +struct pci_dev *pdev =to_pci_dev (dev); +struct drm_device *drm_dev =pci_get_drvdata (pdev); +struct cirrus_device *cdev = drm_dev->dev_private; + +drm_kms_helper_poll_disable (drm_dev); + +if (cdev->mode_info.gfbdev) { +console_lock (); +fb_set_suspend (cdev->mode_info.gfbdev->helper.fbdev,1 ); +console_unlock (); + } + +return 0 ; +} + +static int cirrus_pm_resume (struct device *dev) +{ +struct pci_dev *pdev =to_pci_dev (dev); +struct drm_device *drm_dev =pci_get_drvdata (pdev); +struct cirrus_device *cdev = drm_dev->dev_private; + +drm_helper_resume_force_mode (drm_dev); + +if (cdev->mode_info.gfbdev) { +console_lock (); +fb_set_suspend (cdev->mode_info.gfbdev->helper.fbdev,0 ); +console_unlock (); + } + +drm_kms_helper_poll_enable (drm_dev); +return 0 ; +} +static const struct file_operations cirrus_driver_fops = { .owner =THIS_MODULE , .open = drm_open,
@@ -103,11 +139,17 @@ static struct drm_driver driver = { .dumb_destroy = drm_gem_dumb_destroy, }; +static const struct dev_pm_ops cirrus_pm_ops = { +SET_SYSTEM_SLEEP_PM_OPS (cirrus_pm_suspend, + cirrus_pm_resume) +}; +static struct pci_driver cirrus_pci_driver = { .name =DRIVER_NAME , .id_table = pciidlist, .probe = cirrus_pci_probe, .remove = cirrus_pci_remove, + .driver.pm = &cirrus_pm_ops, };static int __init cirrus_init (void )
drivers/gpu/drm/cirrus/cirrus_mode.c +3 -0
@@ -308,6 +308,9 @@ static int cirrus_crtc_mode_set(struct drm_crtc *crtc,WREG_HDR (hdr);cirrus_crtc_do_set_base (crtc, old_fb, x, y,0 ); + +/* Unblank (needed on S3 resume, vgabios doesn't do it then) */ +outb (0x20 ,0x3c0 );return 0 ; }
Signature · 1 line
1.8.3.1
PATCH 2/3 drm: bochs: add power management support
In reply to Gerd Hoffmannbochs kms driver lacks power management support, thus the vga display doesn't work any more after S3 resume.
Fix this by adding suspend and resume functions.
--- drivers/gpu/drm/bochs/bochs.h | 1 + drivers/gpu/drm/bochs/bochs_drv.c | 44 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+)
drivers/gpu/drm/bochs/bochs.h +1 -0
@@ -1,5 +1,6 @@#include <linux/io.h> #include <linux/fb.h> +#include <linux/console.h> #include <drm/drmP.h> #include <drm/drm_crtc.h>
drivers/gpu/drm/bochs/bochs_drv.c +44 -0
56 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH 3/3 drm: bochs: drop unused struct fields
In reply to Gerd Hoffmann--- drivers/gpu/drm/bochs/bochs.h | 2 -- drivers/gpu/drm/bochs/bochs_fbdev.c | 1 - 2 files changed, 3 deletions(-)
drivers/gpu/drm/bochs/bochs.h +0 -2
@@ -88,8 +88,6 @@ struct bochs_device {struct bochs_framebuffer gfb;struct drm_fb_helper helper;int size; -int x1, y1, x2, y2;/* dirty rect */ -spinlock_t dirty_lock;bool initialized; } fb; };
drivers/gpu/drm/bochs/bochs_fbdev.c +0 -1
@@ -190,7 +190,6 @@ int bochs_fbdev_init(struct bochs_device *bochs)int ret; bochs->fb.helper.funcs = &bochs_fb_helper_funcs; -spin_lock_init (&bochs->fb.dirty_lock); ret =drm_fb_helper_init (bochs->dev, &bochs->fb.helper,1 ,1 );
Signature · 1 line
1.8.3.1