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.
Unified · Split
| @@ -486,6 +486,16 @@ static const struct drm_fb_helper_funcs nouveau_fbcon_helper_funcs = { · 485 unmodified lines | ||
| 486 | 486 | .fb_probe = nouveau_fbcon_create, |
| 487 | 487 | }; |
| 488 | 488 | |
| 489 | +static void | |
| 490 | +nouveau_fbcon_set_suspend_work(struct work_struct *work) | |
| 491 | +{ | |
| 492 | + struct nouveau_fbdev *fbcon = container_of(work, typeof(*fbcon), work); | |
| 493 | + console_lock(); | |
| 494 | + nouveau_fbcon_accel_restore(fbcon->dev); | |
| 495 | + nouveau_fbcon_zfill(fbcon->dev, fbcon); | |
| 496 | + fb_set_suspend(fbcon->helper.fbdev, FBINFO_STATE_RUNNING); | |
| 497 | + console_unlock(); | |
| 498 | +} | |
| 489 | 499 | |
| 490 | 500 | int |
| 491 | 501 | nouveau_fbcon_init(struct drm_device *dev) |
| @@ -503,6 +513,7 @@ nouveau_fbcon_init(struct drm_device *dev) · 11 unmodified lines | ||
| 503 | 513 | if (!fbcon) |
| 504 | 514 | return -ENOMEM; |
| 505 | 515 | |
| 516 | + INIT_WORK(&fbcon->work, nouveau_fbcon_set_suspend_work); | |
| 506 | 517 | fbcon->dev = dev; |
| 507 | 518 | drm->fbcon = fbcon; |
| 508 | 519 | |
| @@ -551,14 +562,14 @@ nouveau_fbcon_set_suspend(struct drm_device *dev, int state) · 42 unmodified lines | ||
| 551 | 562 | { |
| 552 | 563 | struct nouveau_drm *drm = nouveau_drm(dev); |
| 553 | 564 | if (drm->fbcon) { |
| 554 | − console_lock(); | |
| 555 | − if (state == 0) { | |
| 556 | − nouveau_fbcon_accel_restore(dev); | |
| 557 | − nouveau_fbcon_zfill(dev, drm->fbcon); | |
| 565 | + if (state == FBINFO_STATE_RUNNING) { | |
| 566 | + schedule_work(&drm->fbcon->work); | |
| 567 | + return; | |
| 558 | 568 | } |
| 569 | + flush_work(&drm->fbcon->work); | |
| 570 | + console_lock(); | |
| 559 | 571 | fb_set_suspend(drm->fbcon->helper.fbdev, state); |
| 560 | − if (state == 1) | |
| 561 | − nouveau_fbcon_accel_save_disable(dev); | |
| 572 | + nouveau_fbcon_accel_save_disable(dev); | |
| 562 | 573 | console_unlock(); |
| 563 | 574 | } |
| 564 | 575 | } |
| @@ -36,6 +36,7 @@ struct nouveau_fbdev { · 35 unmodified lines | ||
| 36 | 36 | struct nouveau_framebuffer nouveau_fb; |
| 37 | 37 | struct list_head fbdev_list; |
| 38 | 38 | struct drm_device *dev; |
| 39 | + struct work_struct work; | |
| 39 | 40 | unsigned int saved_flags; |
| 40 | 41 | struct nvif_object surf2d; |
| 41 | 42 | struct nvif_object clip; |