aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2017-10-13 10:59:01 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2017-12-19 03:32:00 -0500
commita921c1a8ed96ecc4257be487cc582440dffe71e1 (patch)
tree76b476b08f14454b1b8dcf165d7eecb6ebfeea6d /drivers/gpu/drm/omapdrm
parent2cd3e6834d49747933bbd806b0bb10a19a15d774 (diff)
drm: omapdrm: dss: Set the DMA coherent mask
When merging the omapdrm and omapdss drivers the omapdrm virtual platform device will disappear, and the omapdss platform device will be used for DMA memory allocation. To prepare for that, set the DMA coherent mask for the device. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm')
-rw-r--r--drivers/gpu/drm/omapdrm/dss/dss.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c
index d1755f12236b..6ce26a4b93b3 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss.c
@@ -23,6 +23,7 @@
23#define DSS_SUBSYS_NAME "DSS" 23#define DSS_SUBSYS_NAME "DSS"
24 24
25#include <linux/debugfs.h> 25#include <linux/debugfs.h>
26#include <linux/dma-mapping.h>
26#include <linux/kernel.h> 27#include <linux/kernel.h>
27#include <linux/module.h> 28#include <linux/module.h>
28#include <linux/io.h> 29#include <linux/io.h>
@@ -1441,6 +1442,12 @@ static int dss_probe(struct platform_device *pdev)
1441 1442
1442 dss.pdev = pdev; 1443 dss.pdev = pdev;
1443 1444
1445 r = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
1446 if (r) {
1447 dev_err(&pdev->dev, "Failed to set the DMA mask\n");
1448 return r;
1449 }
1450
1444 /* 1451 /*
1445 * The various OMAP3-based SoCs can't be told apart using the compatible 1452 * The various OMAP3-based SoCs can't be told apart using the compatible
1446 * string, use SoC device matching. 1453 * string, use SoC device matching.