diff options
Diffstat (limited to 'drivers/gpu/host1x/dev.c')
-rw-r--r-- | drivers/gpu/host1x/dev.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c index 314bf3718cc7..ff348690df94 100644 --- a/drivers/gpu/host1x/dev.c +++ b/drivers/gpu/host1x/dev.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/of_device.h> | 23 | #include <linux/of_device.h> |
24 | #include <linux/clk.h> | 24 | #include <linux/clk.h> |
25 | #include <linux/io.h> | 25 | #include <linux/io.h> |
26 | #include <linux/dma-mapping.h> | ||
26 | 27 | ||
27 | #define CREATE_TRACE_POINTS | 28 | #define CREATE_TRACE_POINTS |
28 | #include <trace/events/host1x.h> | 29 | #include <trace/events/host1x.h> |
@@ -68,6 +69,7 @@ static const struct host1x_info host1x01_info = { | |||
68 | .nb_bases = 8, | 69 | .nb_bases = 8, |
69 | .init = host1x01_init, | 70 | .init = host1x01_init, |
70 | .sync_offset = 0x3000, | 71 | .sync_offset = 0x3000, |
72 | .dma_mask = DMA_BIT_MASK(32), | ||
71 | }; | 73 | }; |
72 | 74 | ||
73 | static const struct host1x_info host1x02_info = { | 75 | static const struct host1x_info host1x02_info = { |
@@ -77,6 +79,7 @@ static const struct host1x_info host1x02_info = { | |||
77 | .nb_bases = 12, | 79 | .nb_bases = 12, |
78 | .init = host1x02_init, | 80 | .init = host1x02_init, |
79 | .sync_offset = 0x3000, | 81 | .sync_offset = 0x3000, |
82 | .dma_mask = DMA_BIT_MASK(32), | ||
80 | }; | 83 | }; |
81 | 84 | ||
82 | static const struct host1x_info host1x04_info = { | 85 | static const struct host1x_info host1x04_info = { |
@@ -86,6 +89,7 @@ static const struct host1x_info host1x04_info = { | |||
86 | .nb_bases = 64, | 89 | .nb_bases = 64, |
87 | .init = host1x04_init, | 90 | .init = host1x04_init, |
88 | .sync_offset = 0x2100, | 91 | .sync_offset = 0x2100, |
92 | .dma_mask = DMA_BIT_MASK(34), | ||
89 | }; | 93 | }; |
90 | 94 | ||
91 | static const struct host1x_info host1x05_info = { | 95 | static const struct host1x_info host1x05_info = { |
@@ -95,6 +99,7 @@ static const struct host1x_info host1x05_info = { | |||
95 | .nb_bases = 64, | 99 | .nb_bases = 64, |
96 | .init = host1x05_init, | 100 | .init = host1x05_init, |
97 | .sync_offset = 0x2100, | 101 | .sync_offset = 0x2100, |
102 | .dma_mask = DMA_BIT_MASK(34), | ||
98 | }; | 103 | }; |
99 | 104 | ||
100 | static struct of_device_id host1x_of_match[] = { | 105 | static struct of_device_id host1x_of_match[] = { |
@@ -148,6 +153,8 @@ static int host1x_probe(struct platform_device *pdev) | |||
148 | if (IS_ERR(host->regs)) | 153 | if (IS_ERR(host->regs)) |
149 | return PTR_ERR(host->regs); | 154 | return PTR_ERR(host->regs); |
150 | 155 | ||
156 | dma_set_mask_and_coherent(host->dev, host->info->dma_mask); | ||
157 | |||
151 | if (host->info->init) { | 158 | if (host->info->init) { |
152 | err = host->info->init(host); | 159 | err = host->info->init(host); |
153 | if (err) | 160 | if (err) |