diff options
| author | Yong Gan <yong.gan@nxp.com> | 2018-08-11 08:21:56 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:33:13 +0800 |
| commit | 5b550b4ca32316ad145c0ba4609353f5847a61ee (patch) | |
| tree | e6fd97b37c13d11a90124c3ded18cecd3451b952 /drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c | |
| parent | bc6a7688a9e8d61be5227e17a1a310abdc9b9153 (diff) | |
MGS-3527 [#imx-1078] Rename fence to dma_fence
Support the kernel 4.9.y in fsl_6.2.4.p2.
Signed-off-by: Yong Gan<yong.gan@nxp.com>
Diffstat (limited to 'drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c')
| -rw-r--r-- | drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c index 08a87e2e35ea..4d00f4a5fbb4 100644 --- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c +++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c @@ -6797,7 +6797,7 @@ gckOS_WaitNativeFence( for (i = 0; i < fence->num_fences; i++) { - struct dma_fence *f = fence->cbs[i].sync_pt; + struct fence *f = fence->cbs[i].sync_pt; struct sync_pt *pt = container_of(f, struct sync_pt, base); /* Do not need to wait on same timeline. */ @@ -7013,13 +7013,13 @@ gckOS_WaitNativeFence( IN gctUINT32 Timeout ) { - struct dma_fence *fence; struct viv_sync_timeline *timeline; gceSTATUS status = gcvSTATUS_OK; unsigned int i; unsigned int numFences; - struct dma_fence **fences; unsigned long timeout; + struct dma_fence *fence; + struct dma_fence **fences; timeline = (struct viv_sync_timeline *) Timeline; @@ -7052,7 +7052,7 @@ gckOS_WaitNativeFence( !dma_fence_is_signaled(f)) { signed long ret; - ret = dma_fence_wait_timeout(fence, 1, timeout); + ret = dma_fence_wait_timeout(f, 1, timeout); if (ret == -ERESTARTSYS) { |