diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-03 19:31:14 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-03 19:31:14 +0400 |
| commit | 80ad99da8bd213e12b925407f1c97a303aa8f87f (patch) | |
| tree | f31f9409e2018154f1ceb2aa44194c6dd017e284 /drivers/gpu/drm/nouveau/nouveau_fbcon.h | |
| parent | 58586869599f6bb38aeca71a847cd77bfea74808 (diff) | |
| parent | eee0815dabbdd7d584bea8275f5758d25c97cb9b (diff) | |
| download | linux-80ad99da8bd213e12b925407f1c97a303aa8f87f.tar.xz | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Nothing too major or scary.
One i915 regression fix, nouveau has a tmds regression fix, along with
a regression fix for the runtime pm code for optimus laptops not
restoring the display hw correctly"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/nouveau: make sure display hardware is reinitialised on runtime resume
drm/nouveau: punt fbcon resume out to a workqueue
drm/nouveau: fix regression on original nv50 board
drm/nv50/disp: fix dpms regression on certain boards
drm/i915: Flush the PTEs after updating them before suspend
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_fbcon.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fbcon.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.h b/drivers/gpu/drm/nouveau/nouveau_fbcon.h index 34658cfa8f5d..0b465c7d3907 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.h +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.h @@ -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; |