gfx: drv: Move read ops sync counter functions into psb_fb.c

The overlay code will want to manipulate sync counters as well, so move
the code to a more appropriate place.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-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_fb.c b/drivers/staging/mrst/drv/psb_fb.c
index 4524c17..e83f1e7 100644 (file)
--- a/drivers/staging/mrst/drv/psb_fb.c
+++ b/drivers/staging/mrst/drv/psb_fb.c
@@ -782,3 +782,19 @@ void psb_modeset_cleanup(struct drm_device *dev)
 
        mutex_unlock(&dev->struct_mutex);
 }
+
+void
+psb_fb_increase_read_ops_pending(PVRSRV_KERNEL_MEM_INFO *psKernelMemInfo)
+{
+       if (psKernelMemInfo && psKernelMemInfo->psKernelSyncInfo)
+               psKernelMemInfo->psKernelSyncInfo
+                       ->psSyncData->ui32ReadOpsPending++;
+}
+
+void
+psb_fb_increase_read_ops_completed(PVRSRV_KERNEL_MEM_INFO *psKernelMemInfo)
+{
+       if (psKernelMemInfo && psKernelMemInfo->psKernelSyncInfo)
+               psKernelMemInfo->psKernelSyncInfo
+                       ->psSyncData->ui32ReadOpsComplete++;
+}

diff --git a/drivers/staging/mrst/drv/psb_fb.h b/drivers/staging/mrst/drv/psb_fb.h
index f421030..dc300e1 100644 (file)
--- a/drivers/staging/mrst/drv/psb_fb.h
+++ b/drivers/staging/mrst/drv/psb_fb.h
@@ -52,6 +52,8 @@ struct psb_fbdev {
 
 extern int psb_intel_connector_clones(struct drm_device *dev, int type_mask);
 
+void psb_fb_increase_read_ops_pending(PVRSRV_KERNEL_MEM_INFO *psKernelMemInfo);
+void psb_fb_increase_read_ops_completed(PVRSRV_KERNEL_MEM_INFO *psKernelMemInfo);
 
 #endif
 

diff --git a/drivers/staging/mrst/drv/psb_page_flip.c b/drivers/staging/mrst/drv/psb_page_flip.c
index 6347441..d443880 100644 (file)
--- a/drivers/staging/mrst/drv/psb_page_flip.c
+++ b/drivers/staging/mrst/drv/psb_page_flip.c
@@ -129,22 +129,6 @@ write_scanout_regs(struct pending_flip *pending_flip, uint32_t offset)
 }
 
 static void
-increase_read_ops_pending(PVRSRV_KERNEL_MEM_INFO *psKernelMemInfo)
-{
-       if (psKernelMemInfo && psKernelMemInfo->psKernelSyncInfo)
-               psKernelMemInfo->psKernelSyncInfo
-                       ->psSyncData->ui32ReadOpsPending++;
-}
-
-static void
-increase_read_ops_completed(PVRSRV_KERNEL_MEM_INFO *psKernelMemInfo)
-{
-       if (psKernelMemInfo && psKernelMemInfo->psKernelSyncInfo)
-               psKernelMemInfo->psKernelSyncInfo
-                       ->psSyncData->ui32ReadOpsComplete++;
-}
-
-static void
 psb_intel_flip_complete(struct pending_flip *pending_flip,
                bool failed_vblank_get)
 {
@@ -157,7 +141,7 @@ psb_intel_flip_complete(struct pending_flip *pending_flip,
                send_page_flip_event(dev, pipe, pending_flip);
                if (!failed_vblank_get)
                        drm_vblank_put(dev, pipe);
-               increase_read_ops_completed(pending_flip->old_mem_info);
+               psb_fb_increase_read_ops_completed(pending_flip->old_mem_info);
                pvr_trcmd_check_syn_completions(PVR_TRCMD_FLPCOMP);
                PVRSRVScheduleDeviceCallbacks();
 
@@ -245,7 +229,7 @@ psb_intel_crtc_page_flip(struct drm_crtc *crtc,
 
        new_pending_flip->old_mem_info = current_fb_mem_info;
 
-       increase_read_ops_pending(current_fb_mem_info);
+       psb_fb_increase_read_ops_pending(current_fb_mem_info);
 
        fltrace = pvr_trcmd_reserve(PVR_TRCMD_FLPREQ, task_tgid_nr(current),
                                  current->comm, sizeof(*fltrace));