| Brad Bishop | 286d45c | 2018-10-02 15:21:57 -0400 | [diff] [blame] | 1 | From ed7242238151c12029c566d1974058c579d8ae3d Mon Sep 17 00:00:00 2001 |
| 2 | From: Madhurkiran Harikrishnan <madhurki@xilinx.com> |
| 3 | Date: Wed, 25 Jan 2017 10:00:33 -0800 |
| 4 | Subject: [PATCH 6/9] arm.c: global variable dma_ops is removed from the kernel |
| 5 | 4.7 |
| 6 | |
| 7 | Refer kernel commit 1dccb598df549d892b6450c261da54cdd7af44b4, the global |
| 8 | dma_ops variable and the special-casing for ACPI is removed , and just |
| 9 | returns the dma ops that got set for the device, or the dummy_dma_ops |
| 10 | if none were present. |
| 11 | |
| 12 | Signed-off-by: Madhurkiran Harikrishnan <madhurki@xilinx.com> |
| 13 | Upstream Status: Pending |
| 14 | --- |
| 15 | driver/src/devicedrv/mali/platform/arm/arm.c | 3 ++- |
| 16 | 1 file changed, 2 insertions(+), 1 deletion(-) |
| 17 | |
| 18 | diff --git a/driver/src/devicedrv/mali/platform/arm/arm.c b/driver/src/devicedrv/mali/platform/arm/arm.c |
| 19 | index 62f9be6..57ca989 100644 |
| 20 | --- platform/arm/arm.c |
| 21 | +++ b/platform/arm/arm.c |
| 22 | @@ -529,8 +529,9 @@ int mali_platform_device_init(struct platform_device *device) |
| 23 | */ |
| 24 | if (!device->dev.dma_mask) |
| 25 | device->dev.dma_mask = &device->dev.coherent_dma_mask; |
| 26 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)) |
| 27 | device->dev.archdata.dma_ops = dma_ops; |
| 28 | - |
| 29 | +#endif |
| 30 | err = platform_device_add_data(device, &mali_gpu_data, sizeof(mali_gpu_data)); |
| 31 | |
| 32 | if (0 == err) { |
| 33 | -- |
| 34 | 2.7.4 |
| 35 | |