diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-15 01:54:12 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-15 01:54:12 +0100 |
| commit | e37e0ee0190034a059c9faea8adfb4982fb24ddd (patch) | |
| tree | ba6d6da8ae099eb734f4d8d33bf648fe0dfa39e7 /drivers/gpu/host1x | |
| parent | Merge tag 'dmaengine-4.15-rc1' of git://git.infradead.org/users/vkoul/slave-dma (diff) | |
| parent | dma-mapping: turn dma_cache_sync into a dma_map_ops method (diff) | |
| download | linux-e37e0ee0190034a059c9faea8adfb4982fb24ddd.tar.xz linux-e37e0ee0190034a059c9faea8adfb4982fb24ddd.zip | |
Merge tag 'dma-mapping-4.15' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping updates from Christoph Hellwig:
- turn dma_cache_sync into a dma_map_ops instance and remove
implementation that purely are dead because the architecture doesn't
support noncoherent allocations
- add a flag for busses that need DMA configuration (Robin Murphy)
* tag 'dma-mapping-4.15' of git://git.infradead.org/users/hch/dma-mapping:
dma-mapping: turn dma_cache_sync into a dma_map_ops method
sh: make dma_cache_sync a no-op
xtensa: make dma_cache_sync a no-op
unicore32: make dma_cache_sync a no-op
powerpc: make dma_cache_sync a no-op
mn10300: make dma_cache_sync a no-op
microblaze: make dma_cache_sync a no-op
ia64: make dma_cache_sync a no-op
frv: make dma_cache_sync a no-op
x86: make dma_cache_sync a no-op
floppy: consolidate the dummy fd_cacheflush definition
drivers: flag buses which demand DMA configuration
Diffstat (limited to 'drivers/gpu/host1x')
| -rw-r--r-- | drivers/gpu/host1x/bus.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c index f9cde03030fd..ed03b3243195 100644 --- a/drivers/gpu/host1x/bus.c +++ b/drivers/gpu/host1x/bus.c @@ -320,6 +320,7 @@ struct bus_type host1x_bus_type = { .name = "host1x", .match = host1x_device_match, .pm = &host1x_device_pm_ops, + .force_dma = true, }; static void __host1x_device_del(struct host1x_device *device) |