mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

drm/nouveau: punt fbcon resume out to a workqueue 

Preparation for some runtime pm fixes.  Currently we skip over fbcon
suspend/resume in the runtime path, which causes issues on resume if
fbcon tries to write to the framebuffer before the BAR subdev has
been resumed to restore the BAR1 VM setup.

As we might be woken up via a sysfs connector, we are unable to call
fb_set_suspend() in the resume path as it could make its way down to
a modeset and cause all sorts of locking hilarity.

To solve this, we'll just delay the fbcon resume to a workqueue.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2014-10-01 11:11:25 +10:00
parent f2f9a2cbaf
commit 634ffcccfb
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/gpu/drm/nouveau/nouveau_fbcon.c
View File

@ -486,6 +486,16 @@ static const struct drm_fb_helper_funcs nouveau_fbcon_helper_funcs = {
.fb_probe = nouveau_fbcon_create,
};
static void
nouveau_fbcon_set_suspend_work(struct work_struct *work)
{
struct nouveau_fbdev *fbcon = container_of(work, typeof(*fbcon), work);
console_lock();
nouveau_fbcon_accel_restore(fbcon->dev);
nouveau_fbcon_zfill(fbcon->dev, fbcon);
fb_set_suspend(fbcon->helper.fbdev, FBINFO_STATE_RUNNING);
console_unlock();
}
int
nouveau_fbcon_init(struct drm_device *dev)
@ -503,6 +513,7 @@ nouveau_fbcon_init(struct drm_device *dev)
if (!fbcon)
return -ENOMEM;
INIT_WORK(&fbcon->work, nouveau_fbcon_set_suspend_work);
fbcon->dev = dev;
drm->fbcon = fbcon;
@ -551,14 +562,14 @@ nouveau_fbcon_set_suspend(struct drm_device *dev, int state)
{
struct nouveau_drm *drm = nouveau_drm(dev);
if (drm->fbcon) {
console_lock();
if (state == 0) {
nouveau_fbcon_accel_restore(dev);
nouveau_fbcon_zfill(dev, drm->fbcon);
if (state == FBINFO_STATE_RUNNING) {
schedule_work(&drm->fbcon->work);
return;
}
flush_work(&drm->fbcon->work);
console_lock();
fb_set_suspend(drm->fbcon->helper.fbdev, state);
if (state == 1)
nouveau_fbcon_accel_save_disable(dev);
nouveau_fbcon_accel_save_disable(dev);
console_unlock();
}
}

1
drivers/gpu/drm/nouveau/nouveau_fbcon.h
View File

@ -36,6 +36,7 @@ struct nouveau_fbdev {
struct nouveau_framebuffer nouveau_fb;
struct list_head fbdev_list;
struct drm_device *dev;
struct work_struct work;
unsigned int saved_flags;
struct nvif_object surf2d;
struct nvif_object clip;