drm/etnaviv: call perf_reg_read(..)

[linux-2.6-microblaze.git] / drivers / gpu / drm / etnaviv / etnaviv_perfmon.c

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
index 75f9db8..782732e 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
@@ -46,7 +46,7 @@ static u32 perf_reg_read(struct etnaviv_gpu *gpu,
        return gpu_read(gpu, domain->profile_read);
 }
 
-static u32 pipe_reg_read(struct etnaviv_gpu *gpu,
+static u32 pipe_perf_reg_read(struct etnaviv_gpu *gpu,
        const struct etnaviv_pm_domain *domain,
        const struct etnaviv_pm_signal *signal)
 {
@@ -58,8 +58,7 @@ static u32 pipe_reg_read(struct etnaviv_gpu *gpu,
                clock &= ~(VIVS_HI_CLOCK_CONTROL_DEBUG_PIXEL_PIPE__MASK);
                clock |= VIVS_HI_CLOCK_CONTROL_DEBUG_PIXEL_PIPE(i);
                gpu_write(gpu, VIVS_HI_CLOCK_CONTROL, clock);
-               gpu_write(gpu, domain->profile_config, signal->data);
-               value += gpu_read(gpu, domain->profile_read);
+               value += perf_reg_read(gpu, domain, signal);
        }
 
        /* switch back to pixel pipe 0 to prevent GPU hang */
@@ -141,22 +140,22 @@ static const struct etnaviv_pm_domain doms_3d[] = {
                        {
                                "PIXEL_COUNT_KILLED_BY_COLOR_PIPE",
                                VIVS_MC_PROFILE_CONFIG0_PE_PIXEL_COUNT_KILLED_BY_COLOR_PIPE,
-                               &pipe_reg_read
+                               &pipe_perf_reg_read
                        },
                        {
                                "PIXEL_COUNT_KILLED_BY_DEPTH_PIPE",
                                VIVS_MC_PROFILE_CONFIG0_PE_PIXEL_COUNT_KILLED_BY_DEPTH_PIPE,
-                               &pipe_reg_read
+                               &pipe_perf_reg_read
                        },
                        {
                                "PIXEL_COUNT_DRAWN_BY_COLOR_PIPE",
                                VIVS_MC_PROFILE_CONFIG0_PE_PIXEL_COUNT_DRAWN_BY_COLOR_PIPE,
-                               &pipe_reg_read
+                               &pipe_perf_reg_read
                        },
                        {
                                "PIXEL_COUNT_DRAWN_BY_DEPTH_PIPE",
                                VIVS_MC_PROFILE_CONFIG0_PE_PIXEL_COUNT_DRAWN_BY_DEPTH_PIPE,
-                               &pipe_reg_read
+                               &pipe_perf_reg_read
                        }
                }
        },
@@ -184,32 +183,32 @@ static const struct etnaviv_pm_domain doms_3d[] = {
                        {
                                "VS_INST_COUNTER",
                                VIVS_MC_PROFILE_CONFIG0_SH_VS_INST_COUNTER,
-                               &pipe_reg_read
+                               &pipe_perf_reg_read
                        },
                        {
                                "RENDERED_VERTICE_COUNTER",
                                VIVS_MC_PROFILE_CONFIG0_SH_RENDERED_VERTICE_COUNTER,
-                               &pipe_reg_read
+                               &pipe_perf_reg_read
                        },
                        {
                                "VTX_BRANCH_INST_COUNTER",
                                VIVS_MC_PROFILE_CONFIG0_SH_VTX_BRANCH_INST_COUNTER,
-                               &pipe_reg_read
+                               &pipe_perf_reg_read
                        },
                        {
                                "VTX_TEXLD_INST_COUNTER",
                                VIVS_MC_PROFILE_CONFIG0_SH_VTX_TEXLD_INST_COUNTER,
-                               &pipe_reg_read
+                               &pipe_perf_reg_read
                        },
                        {
                                "PXL_BRANCH_INST_COUNTER",
                                VIVS_MC_PROFILE_CONFIG0_SH_PXL_BRANCH_INST_COUNTER,
-                               &pipe_reg_read
+                               &pipe_perf_reg_read
                        },
                        {
                                "PXL_TEXLD_INST_COUNTER",
                                VIVS_MC_PROFILE_CONFIG0_SH_PXL_TEXLD_INST_COUNTER,
-                               &pipe_reg_read
+                               &pipe_perf_reg_read
                        }
                }
        },
@@ -237,17 +236,17 @@ static const struct etnaviv_pm_domain doms_3d[] = {
                        {
                                "DEPTH_CLIPPED_COUNTER",
                                VIVS_MC_PROFILE_CONFIG1_PA_DEPTH_CLIPPED_COUNTER,
-                               &pipe_reg_read
+                               &pipe_perf_reg_read
                        },
                        {
                                "TRIVIAL_REJECTED_COUNTER",
                                VIVS_MC_PROFILE_CONFIG1_PA_TRIVIAL_REJECTED_COUNTER,
-                               &pipe_reg_read
+                               &pipe_perf_reg_read
                        },
                        {
                                "CULLED_COUNTER",
                                VIVS_MC_PROFILE_CONFIG1_PA_CULLED_COUNTER,
-                               &pipe_reg_read
+                               &pipe_perf_reg_read
                        }
                }
        },
@@ -400,7 +399,7 @@ static const struct etnaviv_pm_domain doms_2d[] = {
                        {
                                "PIXELS_RENDERED_2D",
                                VIVS_MC_PROFILE_CONFIG0_PE_PIXELS_RENDERED_2D,
-                               &pipe_reg_read
+                               &pipe_perf_reg_read
                        }
                }
        }