diff options
| author | popcornmix <popcornmix@gmail.com> | 2016-11-16 21:17:27 +0000 |
|---|---|---|
| committer | popcornmix <popcornmix@gmail.com> | 2016-11-16 21:31:37 +0000 |
| commit | 8b0a53e9f9d3a2c2e07b2341ccbf5eb4adc8100f (patch) | |
| tree | 88283270630e1d7e2b110e65c039b64ca80c005c | |
| parent | abe33682e797932abcdc0fd1421f30cddc1f101a (diff) | |
fb: Use correct bus address for dest of dma memcpyraspberrypi-kernel_1.20161116-1
| -rw-r--r-- | drivers/video/fbdev/bcm2708_fb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/bcm2708_fb.c b/drivers/video/fbdev/bcm2708_fb.c index fd4766a18e8c..dbc0c59cf709 100644 --- a/drivers/video/fbdev/bcm2708_fb.c +++ b/drivers/video/fbdev/bcm2708_fb.c @@ -438,7 +438,7 @@ static void dma_memcpy(struct bcm2708_fb *fb, dma_addr_t dst, dma_addr_t src, in cb->info = BCM2708_DMA_BURST(burst_size) | BCM2708_DMA_S_WIDTH | BCM2708_DMA_S_INC | BCM2708_DMA_D_WIDTH | - BCM2708_DMA_D_INC | BCM2708_DMA_TDMODE; + BCM2708_DMA_D_INC; cb->dst = dst; cb->src = src; cb->length = size; @@ -521,7 +521,7 @@ static long vc_mem_copy(struct bcm2708_fb *fb, unsigned long arg) size_t s = min(size, remaining); unsigned char *p = (unsigned char *)ioparam.src + offset; unsigned char *q = (unsigned char *)ioparam.dst + offset; - dma_memcpy(fb, (dma_addr_t)buf, INTALIAS_L1L2_NONALLOCATING((dma_addr_t)p), size); + dma_memcpy(fb, bus_addr, INTALIAS_L1L2_NONALLOCATING((dma_addr_t)p), size); if (copy_to_user(q, buf, s) != 0) { pr_err("[%s]: failed to copy-to-user\n", __func__); |