OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/etnaviv: use submit exec_state for perfmon sampling

Browse Source 
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>
This commit is contained in:
Lucas Stach 2017-11-24 15:19:16 +01:00
parent 797b0159e6
commit 7a9c0fe20e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/etnaviv/etnaviv_gpu.c
View File

@ -1324,7 +1324,7 @@ static void sync_point_perfmon_sample(struct etnaviv_gpu *gpu,
const struct etnaviv_perfmon_request *pmr = submit->pmrs + i; const struct etnaviv_perfmon_request *pmr = submit->pmrs + i;
if (pmr->flags == flags) if (pmr->flags == flags)
etnaviv_perfmon_process(gpu, pmr); etnaviv_perfmon_process(gpu, pmr, submit->exec_state);
} }
} }

4
drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
View File

@ -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, 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_domain *dom;
const struct etnaviv_pm_signal *sig; const struct etnaviv_pm_signal *sig;
u32 *bo = pmr->bo_vma; u32 *bo = pmr->bo_vma;

2
drivers/gpu/drm/etnaviv/etnaviv_perfmon.h
View File

@ -44,6 +44,6 @@ int etnaviv_pm_req_validate(const struct drm_etnaviv_gem_submit_pmr *r,
u32 exec_state); u32 exec_state);
void etnaviv_perfmon_process(struct etnaviv_gpu *gpu, 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__ */ #endif /* __ETNAVIV_PERFMON_H__ */