drm/etnaviv: use submit exec_state for perfmon sampling

The GPU exec state may have changed at the time when the perfmon sampling
is done, as it reflects the state of the last submission, not the current
GPU execution state.

So for proper sampling we must use the submit exec_state.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
index 675c31b..afc4b6c 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
@@ -1324,7 +1324,7 @@ static void sync_point_perfmon_sample(struct etnaviv_gpu *gpu,
                const struct etnaviv_perfmon_request *pmr = submit->pmrs + i;
 
                if (pmr->flags == flags)
-                       etnaviv_perfmon_process(gpu, pmr);
+                       etnaviv_perfmon_process(gpu, pmr, submit->exec_state);
        }
 }
 

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
index 768f5aa..26dddfc 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
@@ -479,9 +479,9 @@ int etnaviv_pm_req_validate(const struct drm_etnaviv_gem_submit_pmr *r,
 }
 
 void etnaviv_perfmon_process(struct etnaviv_gpu *gpu,
-       const struct etnaviv_perfmon_request *pmr)
+       const struct etnaviv_perfmon_request *pmr, u32 exec_state)
 {
-       const struct etnaviv_pm_domain_meta *meta = &doms_meta[gpu->exec_state];
+       const struct etnaviv_pm_domain_meta *meta = &doms_meta[exec_state];
        const struct etnaviv_pm_domain *dom;
        const struct etnaviv_pm_signal *sig;
        u32 *bo = pmr->bo_vma;

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.h b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.h
index 35dce19..c1653c6 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.h
+++ b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.h
@@ -44,6 +44,6 @@ int etnaviv_pm_req_validate(const struct drm_etnaviv_gem_submit_pmr *r,
        u32 exec_state);
 
 void etnaviv_perfmon_process(struct etnaviv_gpu *gpu,
-       const struct etnaviv_perfmon_request *pmr);
+       const struct etnaviv_perfmon_request *pmr, u32 exec_state);
 
 #endif /* __ETNAVIV_PERFMON_H__ */