MALI: rockchip: upgrade midgard DDK to r9p0-05rel0

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / arm / midgard / mali_kbase_tlstream.c

diff --git a/drivers/gpu/arm/midgard/mali_kbase_tlstream.c b/drivers/gpu/arm/midgard/mali_kbase_tlstream.c
index 07804d1b9f0e06942800a83829fcdb14d0609711..0994ddd7c95ffff1d9ced6d4ef7cfb674db97523 100644 (file)
--- a/drivers/gpu/arm/midgard/mali_kbase_tlstream.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_tlstream.c
@@ -448,15 +448,15 @@ static const struct tp_desc tp_desc_aux[] = {
                KBASE_AUX_PAGEFAULT,
                __stringify(KBASE_AUX_PAGEFAULT),
                "Page fault",
-               "@II",
-               "ctx_nr,page_cnt"
+               "@IL",
+               "ctx_nr,page_cnt_change"
        },
        {
                KBASE_AUX_PAGESALLOC,
                __stringify(KBASE_AUX_PAGESALLOC),
                "Total alloc pages change",
-               "@l",
-               "page_cnt_change"
+               "@IL",
+               "ctx_nr,page_cnt"
        }
 };
 
@@ -1998,12 +1998,12 @@ void kbase_tlstream_aux_job_softstop(u32 js_id)
        kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_AUX, flags);
 }
 
-void kbase_tlstream_aux_pagefault(u32 ctx_nr, u32 page_count)
+void kbase_tlstream_aux_pagefault(u32 ctx_nr, u64 page_count_change)
 {
        const u32     msg_id = KBASE_AUX_PAGEFAULT;
        const size_t  msg_size =
                sizeof(msg_id) + sizeof(u64) + sizeof(ctx_nr) +
-               sizeof(page_count);
+               sizeof(page_count_change);
        unsigned long flags;
        char          *buffer;
        size_t        pos = 0;
@@ -2016,17 +2016,19 @@ void kbase_tlstream_aux_pagefault(u32 ctx_nr, u32 page_count)
        pos = kbasep_tlstream_write_timestamp(buffer, pos);
        pos = kbasep_tlstream_write_bytes(buffer, pos, &ctx_nr, sizeof(ctx_nr));
        pos = kbasep_tlstream_write_bytes(
-                       buffer, pos, &page_count, sizeof(page_count));
+                       buffer, pos,
+                       &page_count_change, sizeof(page_count_change));
        KBASE_DEBUG_ASSERT(msg_size == pos);
 
        kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_AUX, flags);
 }
 
-void kbase_tlstream_aux_pagesalloc(s64 page_count_change)
+void kbase_tlstream_aux_pagesalloc(u32 ctx_nr, u64 page_count)
 {
        const u32     msg_id = KBASE_AUX_PAGESALLOC;
        const size_t  msg_size =
-               sizeof(msg_id) + sizeof(u64) + sizeof(page_count_change);
+               sizeof(msg_id) + sizeof(u64) + sizeof(ctx_nr) +
+               sizeof(page_count);
        unsigned long flags;
        char          *buffer;
        size_t        pos = 0;
@@ -2037,9 +2039,9 @@ void kbase_tlstream_aux_pagesalloc(s64 page_count_change)
 
        pos = kbasep_tlstream_write_bytes(buffer, pos, &msg_id, sizeof(msg_id));
        pos = kbasep_tlstream_write_timestamp(buffer, pos);
+       pos = kbasep_tlstream_write_bytes(buffer, pos, &ctx_nr, sizeof(ctx_nr));
        pos = kbasep_tlstream_write_bytes(
-                       buffer, pos,
-                       &page_count_change, sizeof(page_count_change));
+                       buffer, pos, &page_count, sizeof(page_count));
        KBASE_DEBUG_ASSERT(msg_size == pos);
 
        kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_AUX, flags);