summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2016-11-04 17:20:35 +1000
committerBen Skeggs <bskeggs@redhat.com>2016-11-07 14:04:46 +1000
commit07193f705154e26e1a246b81a5ae59f6354e8e7a (patch)
tree045462bffc672f6903563e54df9f7bad2c452c83
parent3b4c0abb1bb72304c78d5919d20c4814424fff79 (diff)
downloadop-kernel-dev-07193f705154e26e1a246b81a5ae59f6354e8e7a.zip
op-kernel-dev-07193f705154e26e1a246b81a5ae59f6354e8e7a.tar.gz
drm/nouveau/kms: execute drm_mode_config_reset() after constructing display
This will ensure we have some kind of initial atomic state for all objects after initialisation. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_display.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 081af3a..1c4b2ca 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -530,6 +530,8 @@ nouveau_display_create(struct drm_device *dev)
if (ret)
goto disp_create_err;
+ drm_mode_config_reset(dev);
+
if (dev->mode_config.num_crtc) {
ret = nouveau_display_vblank_init(dev);
if (ret)
OpenPOWER on IntegriCloud