use sync_file instead of the mali_internal_sync_fence [2/3]

PD#170298: use sync_file instead of the mali_internal_sync_fence
this is only a minimal change.
Change-Id: I848fc202dbcebbb46ce6908b41b02cf2b0404e97

diff --git a/mali/linux/mali_internal_sync.h b/mali/linux/mali_internal_sync.h
index d801cfcd2ba8979fbbf2d81ce7a6eb651a1d3707..c80545b3ae50e48ae1b6def8987ce0720f03a29c 100755 (executable)
--- a/mali/linux/mali_internal_sync.h
+++ b/mali/linux/mali_internal_sync.h
@@ -83,28 +83,7 @@ struct mali_internal_sync_fence_cb {
 };
 #endif
 
-struct mali_internal_sync_fence {
-       struct file             *file;
-       struct kref             kref;
-       char            name[32];
-#ifdef CONFIG_DEBUG_FS
-       struct list_head        sync_file_list;
-#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
-       int num_fences;
-#endif
-       wait_queue_head_t       wq;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
-       atomic_t                status;
-       struct mali_internal_sync_fence_cb    cbs[];
-#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
-       struct fence *fence;
-       struct fence_cb cb;
-#else
-       struct dma_fence *fence;
-       struct dma_fence_cb cb;
-#endif
-};
+#define mali_internal_sync_fence sync_file
 
 struct mali_internal_sync_fence_waiter;
 

diff --git a/utgard/platform/meson_bu/scaling.c b/utgard/platform/meson_bu/scaling.c
index 489564fecba227d76f75ce1c6945eeef37cef1c8..cb11d83f63425ca3bab750fad931e817a6eafa06 100644 (file)
--- a/utgard/platform/meson_bu/scaling.c
+++ b/utgard/platform/meson_bu/scaling.c
@@ -445,7 +445,7 @@ static void mali_decide_next_status(struct mali_gpu_utilization_data *data, int*
        }
        if (decided_fs_idx > pmali_plat->scale_info.maxclk) {
                decided_fs_idx = pmali_plat->scale_info.maxclk;
-               printk("gpu debug, next index above max, set to %d\n", decided_fs_idx);
+               scalingdbg(1, "gpu debug, next index above max, set to %d\n", decided_fs_idx);
        }
 
        if (change_mode)