From 69b8d30757fa392c3d6b26cc3ee4b76c00961d4e Mon Sep 17 00:00:00 2001 From: Li Huang Date: Thu, 13 Feb 2020 09:48:21 +0800 Subject: [PATCH] RK3368 GPU: CacheOpSetTimeline(): realize sw_sync_timeline_inc() on 4.19 Change-Id: I43bdae99426dd0cb4e2d03a5c8278a1da6b6834f Signed-off-by: Li Huang --- drivers/staging/imgtec/rogue/Makefile | 1 + drivers/staging/imgtec/rogue/cache_km.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/staging/imgtec/rogue/Makefile b/drivers/staging/imgtec/rogue/Makefile index 9d0f4f31db4a..afbc761fe337 100644 --- a/drivers/staging/imgtec/rogue/Makefile +++ b/drivers/staging/imgtec/rogue/Makefile @@ -4,6 +4,7 @@ ccflags-y += -include $(srctree)/drivers/staging/imgtec/config_kernel.h \ -I$(srctree)/$(src) \ -I$(srctree)/$(src)/hwdefs \ -I$(srctree)/$(src)/hwdefs/km \ + -I$(srctree)/drivers/dma-buf \ -I$(srctree)/$(src)/rk3368 ccflags-$(CONFIG_X86) += -mno-soft-float diff --git a/drivers/staging/imgtec/rogue/cache_km.c b/drivers/staging/imgtec/rogue/cache_km.c index e883c9921e83..95d42da12344 100644 --- a/drivers/staging/imgtec/rogue/cache_km.c +++ b/drivers/staging/imgtec/rogue/cache_km.c @@ -64,6 +64,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "ri_server.h" #endif +#include "sync_debug.h" +#include + /* Top-level file-local build definitions */ #if defined(DEBUG) && defined(LINUX) #define CACHEOP_DEBUG @@ -1645,6 +1648,8 @@ PVRSRV_ERROR CacheOpSetTimeline (IMG_INT32 i32Timeline) { PVRSRV_ERROR eError; + unsigned int count = 1; + #if defined(SUPPORT_RANGEBASED_CACHEFLUSH_DEFERRED) PVRSRV_DATA *psPVRSRVData = PVRSRVGetPVRSRVData(); CACHEOP_WORK_ITEM *psCacheOpWorkItem; @@ -1709,8 +1714,7 @@ PVRSRV_ERROR CacheOpSetTimeline (IMG_INT32 i32Timeline) sw_sync_timeline_inc(psFile->private_data, 1); #else //Warning - //if (0 != sw_sync_ioctl_inc(psFile->private_data, count)) - // printk("PVR SW_SYNC_IOC_INC failed \n"); + sync_timeline_signal( (struct sync_timeline *)(psFile->private_data), count); #endif fput(psFile);