summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/armada/armada_drv.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2018-07-30 11:53:06 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2018-07-30 11:53:06 +0100
commit6bd02908836ed00aa7fcdc759d490029137c2b30 (patch)
tree9e7577e2a3874030815f5e579d4667634cf143ba /drivers/gpu/drm/armada/armada_drv.c
parent34e25ed60ae2cdf91b953dd3772ae48a6bffbd4c (diff)
downloadlinux-6bd02908836ed00aa7fcdc759d490029137c2b30.tar.gz
linux-6bd02908836ed00aa7fcdc759d490029137c2b30.tar.bz2
linux-6bd02908836ed00aa7fcdc759d490029137c2b30.zip
drm/armada: enable atomic modeset support
Enable atomic modeset helpers, and internal DRM use of atomic modeset with armada-drm. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'drivers/gpu/drm/armada/armada_drv.c')
-rw-r--r--drivers/gpu/drm/armada/armada_drv.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
index 7517f23bb9cd..20661bd9001e 100644
--- a/drivers/gpu/drm/armada/armada_drv.c
+++ b/drivers/gpu/drm/armada/armada_drv.c
@@ -9,6 +9,7 @@
#include <linux/component.h>
#include <linux/module.h>
#include <linux/of_graph.h>
+#include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc_helper.h>
#include <drm/drm_fb_helper.h>
#include <drm/drm_of.h>
@@ -73,7 +74,7 @@ static struct drm_driver armada_drm_driver = {
.desc = "Armada SoC DRM",
.date = "20120730",
.driver_features = DRIVER_GEM | DRIVER_MODESET |
- DRIVER_PRIME,
+ DRIVER_PRIME | DRIVER_ATOMIC,
.ioctls = armada_ioctls,
.fops = &armada_drm_fops,
};
@@ -81,6 +82,8 @@ static struct drm_driver armada_drm_driver = {
static const struct drm_mode_config_funcs armada_drm_mode_config_funcs = {
.fb_create = armada_fb_create,
.output_poll_changed = drm_fb_helper_output_poll_changed,
+ .atomic_check = drm_atomic_helper_check,
+ .atomic_commit = drm_atomic_helper_commit,
};
static int armada_drm_bind(struct device *dev)