diff options
author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2015-01-13 11:18:49 +0300 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-22 05:15:08 +0300 |
commit | 4dc63933ea518501fe9cfe6a8f8797d21095e76f (patch) | |
tree | eb98c163485dba66a0dac05e41188d3e14ce3bc4 /drivers/gpu/drm/nouveau/nouveau_fbcon.h | |
parent | 4d8bb03bced49526304592728002ebea54c7f224 (diff) | |
download | linux-4dc63933ea518501fe9cfe6a8f8797d21095e76f.tar.xz |
drm/nouveau: dont switch vt on suspend
Restore the nv50 cursor bo on resume, and load the lut in
nv50_display_display_init so it gets set on resume too.
Tested on a fermi and a curie.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_fbcon.h')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fbcon.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.h b/drivers/gpu/drm/nouveau/nouveau_fbcon.h index 6208e70e4a1c..1e2e9e27a03b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.h +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.h @@ -36,7 +36,6 @@ 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; |