diff options
| author | Yong Gan <yong.gan@nxp.com> | 2018-07-20 06:40:22 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:32:43 +0800 |
| commit | 6a53e5e367fada6191c1b27313f47acc40011703 (patch) | |
| tree | 7b5c509dad49f10fac21178d0a5633ace5c6daa0 /drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h | |
| parent | 0efe4e02da4052d2f1a4bce6822deedca6a249d3 (diff) | |
MA-11957 [Android] Rename fence to dma_fence
Rename fence interfaces to dma_fence to match with the upstream
commit, f54d1867005c ("dma-buf: Rename struct fence to dma_fence"),
changes.
Fix compile issue sync_timeline_create is not defined.
Change-Id: I0f89a089f11131070f96a5ddc922938f4b28615f
Signed-off-by: zhang sanshan <sanshan.zhang@nxp.com>
Diffstat (limited to 'drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h')
| -rw-r--r-- | drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h index 9fe50429b164..4b526bab7bb4 100644 --- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h +++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_sync.h @@ -101,8 +101,8 @@ struct sync_pt * viv_sync_pt_create(struct viv_sync_timeline *obj, #else /* v4.9.0 */ #include <linux/sync_file.h> -#include <linux/fence.h> -#include <linux/fence-array.h> +#include <linux/dma-fence.h> +#include <linux/dma-fence-array.h> #include <gc_hal.h> #include <gc_hal_base.h> @@ -125,7 +125,7 @@ struct viv_sync_timeline struct viv_fence { /* must be the first. */ - struct fence base; + struct dma_fence base; spinlock_t lock; struct viv_sync_timeline *parent; @@ -138,7 +138,7 @@ struct viv_sync_timeline * viv_sync_timeline_create(const char *name, gckOS Os); void viv_sync_timeline_destroy(struct viv_sync_timeline *timeline); -struct fence * viv_fence_create(struct viv_sync_timeline *timeline, +struct dma_fence * viv_fence_create(struct viv_sync_timeline *timeline, gcsSIGNAL *signal); #endif /* v4.9.0 */ |