summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2018-07-30 12:52:34 +0200
committerRussell King <rmk+kernel@armlinux.org.uk>2018-07-30 12:52:34 +0200
commit80c63aee8143d83743a9df6d09309d3d15b20680 (patch)
treeaddb2cd5187ecccced34203bc6c29f0d27dac2b1
parentdrm/armada: merge armada_drm_gra_plane_regs() into only caller (diff)
downloadlinux-80c63aee8143d83743a9df6d09309d3d15b20680.tar.xz
linux-80c63aee8143d83743a9df6d09309d3d15b20680.zip
drm/armada: reset all atomic state during driver initialisation
Reset the atomic state of any converted components during driver initialisation to ensure that we have the atomic state initialised for any component converted to atomic modeset. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
-rw-r--r--drivers/gpu/drm/armada/armada_drv.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
index d1705d298a39..e47b995b4ce6 100644
--- a/drivers/gpu/drm/armada/armada_drv.c
+++ b/drivers/gpu/drm/armada/armada_drv.c
@@ -155,6 +155,8 @@ static int armada_drm_bind(struct device *dev)
priv->drm.irq_enabled = true;
+ drm_mode_config_reset(&priv->drm);
+
ret = armada_fbdev_init(&priv->drm);
if (ret)
goto err_comp;