Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a9c0fe2 authored by Lucas Stach's avatar Lucas Stach
Browse files

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: default avatarLucas Stach <l.stach@pengutronix.de>
parent 797b0159

drivers/gpu/drm/etnaviv/etnaviv_gpu.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}

}

drivers/gpu/drm/etnaviv/etnaviv_perfmon.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/etnaviv/etnaviv_perfmon.h

+1 −1
Original line number Diff line number Diff line
@@ -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__ */