diff options
| author | John Stultz <john.stultz@linaro.org> | 2016-08-04 20:48:00 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2017-01-26 10:54:51 -0800 |
| commit | 131d244b3441761f6883fe44dd1bc68f4b2179a3 (patch) | |
| tree | ed818e8ea12d7b59d458d2aaf7edf2c9e7cf55ea | |
| parent | 0d28e71e439f6566e1d44484a059361a2e476570 (diff) | |
| download | hikey-clang-131d244b3441761f6883fe44dd1bc68f4b2179a3.tar.gz | |
MALI: drivers/gpu/arm/utgard: Fixup after dma_set_attr/DEFINE_DMA_ATTRS was removed in v4.8-rc
Fixup dma_attr code after type was moved to unsigned long.
Signed-off-by: John Stultz <john.stultz@linaro.org>
| -rw-r--r-- | drivers/gpu/arm/utgard/linux/mali_memory_os_alloc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/arm/utgard/linux/mali_memory_os_alloc.c b/drivers/gpu/arm/utgard/linux/mali_memory_os_alloc.c index 1a6cc0649421..f77f18e34f23 100644 --- a/drivers/gpu/arm/utgard/linux/mali_memory_os_alloc.c +++ b/drivers/gpu/arm/utgard/linux/mali_memory_os_alloc.c @@ -28,7 +28,7 @@ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) /* Write combine dma_attrs */ -static DEFINE_DMA_ATTRS(dma_attrs_wc); +static unsigned long dma_attrs_wc; #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) @@ -507,7 +507,7 @@ _mali_osk_errcode_t mali_mem_os_get_table_page(mali_dma_addr *phys, mali_io_addr #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) *mapping = dma_alloc_attrs(&mali_platform_device->dev, _MALI_OSK_MALI_PAGE_SIZE, &tmp_phys, - GFP_KERNEL, &dma_attrs_wc); + GFP_KERNEL, dma_attrs_wc); #else *mapping = dma_alloc_writecombine(&mali_platform_device->dev, _MALI_OSK_MALI_PAGE_SIZE, &tmp_phys, GFP_KERNEL); @@ -546,7 +546,7 @@ void mali_mem_os_release_table_page(mali_dma_addr phys, void *virt) #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) dma_free_attrs(&mali_platform_device->dev, _MALI_OSK_MALI_PAGE_SIZE, virt, phys, - &dma_attrs_wc); + dma_attrs_wc); #else dma_free_writecombine(&mali_platform_device->dev, _MALI_OSK_MALI_PAGE_SIZE, virt, phys); @@ -601,7 +601,7 @@ static void mali_mem_os_page_table_pool_free(size_t nr_to_free) for (i = 0; i < nr_to_free; i++) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) dma_free_attrs(&mali_platform_device->dev, _MALI_OSK_MALI_PAGE_SIZE, - virt_arr[i], (dma_addr_t)phys_arr[i], &dma_attrs_wc); + virt_arr[i], (dma_addr_t)phys_arr[i], dma_attrs_wc); #else dma_free_writecombine(&mali_platform_device->dev, _MALI_OSK_MALI_PAGE_SIZE, @@ -751,7 +751,7 @@ _mali_osk_errcode_t mali_mem_os_init(void) } #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) - dma_set_attr(DMA_ATTR_WRITE_COMBINE, &dma_attrs_wc); + dma_attrs_wc |= DMA_ATTR_WRITE_COMBINE; #endif register_shrinker(&mali_mem_os_allocator.shrinker); |