gfx: pvr: cmd trace: rename flip request syncobj names

The flip request command has an old and a new buffer (and the
corresponding sync objects) as a parameter. Rename the relevant
entries in the trace output to make this clearer.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>

diff --git a/drivers/staging/mrst/drv/psb_page_flip.c b/drivers/staging/mrst/drv/psb_page_flip.c
index 3df0436..d151bdf 100644 (file)
--- a/drivers/staging/mrst/drv/psb_page_flip.c
+++ b/drivers/staging/mrst/drv/psb_page_flip.c
@@ -263,11 +263,11 @@ psb_intel_crtc_page_flip(struct drm_crtc *crtc,
        fltrace = pvr_trcmd_reserve(PVR_TRCMD_FLPREQ, task_tgid_nr(current),
                                  current->comm, sizeof(*fltrace));
        if (current_fb_mem_info && current_fb_mem_info->psKernelSyncInfo)
-               pvr_trcmd_set_syn(&fltrace->src_syn[0],
+               pvr_trcmd_set_syn(&fltrace->old_syn,
                                current_fb_mem_info->psKernelSyncInfo);
        else
-               pvr_trcmd_clear_syn(&fltrace->src_syn[0]);
-       pvr_trcmd_clear_syn(&fltrace->src_syn[1]);
+               pvr_trcmd_clear_syn(&fltrace->old_syn);
+       pvr_trcmd_clear_syn(&fltrace->new_syn);
        pvr_trcmd_commit(fltrace);
 
 

diff --git a/drivers/staging/mrst/pvr/pvr_trace_cmd.c b/drivers/staging/mrst/pvr/pvr_trace_cmd.c
index 78c572f..91a1abe 100644 (file)
--- a/drivers/staging/mrst/pvr/pvr_trace_cmd.c
+++ b/drivers/staging/mrst/pvr/pvr_trace_cmd.c
@@ -145,15 +145,9 @@ static size_t trcmd_prn_flpreq(char *dst, size_t dst_size, const void *tbuf)
 {
        const struct pvr_trcmd_flpreq *d = tbuf;
        size_t len = 0;
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(d->src_syn); i++) {
-               char sname[10];
 
-               snprintf(sname, sizeof(sname), "src_syn%d", i);
-               len += prn_syn(sname, &dst[len], dst_size - len,
-                              &d->src_syn[i]);
-       }
+       len += prn_syn("old_syn ", &dst[len], dst_size - len, &d->old_syn);
+       len += prn_syn("new_syn ", &dst[len], dst_size - len, &d->new_syn);
 
        return len;
 }

diff --git a/drivers/staging/mrst/pvr/pvr_trace_cmd.h b/drivers/staging/mrst/pvr/pvr_trace_cmd.h
index 89eb960..91e7f93 100644 (file)
--- a/drivers/staging/mrst/pvr/pvr_trace_cmd.h
+++ b/drivers/staging/mrst/pvr/pvr_trace_cmd.h
@@ -68,7 +68,8 @@ struct pvr_trcmd_sgxtransfer {
 };
 
 struct pvr_trcmd_flpreq {
-       struct pvr_trcmd_syn    src_syn[2];
+       struct pvr_trcmd_syn    old_syn;
+       struct pvr_trcmd_syn    new_syn;
 };
 
 enum pvr_trcmd_device {

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/common/deviceclass.c b/drivers/staging/mrst/pvr/services4/srvkm/common/deviceclass.c
index 4e10e77..073ca4c 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/common/deviceclass.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/common/deviceclass.c
@@ -1391,11 +1391,11 @@ PVRSRV_ERROR PVRSRVSwapToDCBufferKM(IMG_HANDLE  hDeviceKM,
                                                                        sizeof(DISPLAYCLASS_FLIP_COMMAND) + (sizeof(IMG_RECT) * ui32ClipRectCount));
        fltrace = pvr_trcmd_reserve(PVR_TRCMD_FLPREQ, psPerProc->ui32PID,
                                  psPerProc->name, sizeof(*fltrace));
-       pvr_trcmd_set_syn(&fltrace->src_syn[0], apsSrcSync[0]);
+       pvr_trcmd_set_syn(&fltrace->new_syn, apsSrcSync[0]);
        if (ui32NumSrcSyncs > 1)
-               pvr_trcmd_set_syn(&fltrace->src_syn[1], apsSrcSync[1]);
+               pvr_trcmd_set_syn(&fltrace->old_syn, apsSrcSync[1]);
        else
-               pvr_trcmd_clear_syn(&fltrace->src_syn[1]);
+               pvr_trcmd_clear_syn(&fltrace->old_syn);
 
        pvr_trcmd_commit(fltrace);