summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/dispnv50/disp.c
diff options
context:
space:
mode:
authorBen Skeggs2019-02-12 13:28:13 +0100
committerBen Skeggs2019-02-19 23:59:59 +0100
commit0f9976dd97caac3de5308945eb5b5e1c7754b768 (patch)
tree1edf5ee3e50d4dde7fef2ebe85ef173dd0cea3e8 /drivers/gpu/drm/nouveau/dispnv50/disp.c
parentdrm/nouveau/kms/nv04-nv4x: move suspend code to dispnv04 fini hook (diff)
downloadkernel-qcow2-linux-0f9976dd97caac3de5308945eb5b5e1c7754b768.tar.gz
kernel-qcow2-linux-0f9976dd97caac3de5308945eb5b5e1c7754b768.tar.xz
kernel-qcow2-linux-0f9976dd97caac3de5308945eb5b5e1c7754b768.zip
drm/nouveau/kms/nv04-nv4x: move resume code to dispnv04 init hook
It has no relevance to the atomic path used by newer GPUs. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/dispnv50/disp.c')
-rw-r--r--drivers/gpu/drm/nouveau/dispnv50/disp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index b8a04f178a67..4b1650f51955 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -2244,7 +2244,7 @@ nv50_display_fini(struct drm_device *dev, bool suspend)
}
static int
-nv50_display_init(struct drm_device *dev)
+nv50_display_init(struct drm_device *dev, bool resume, bool runtime)
{
struct nv50_core *core = nv50_disp(dev)->core;
struct drm_encoder *encoder;