OSDN Git Service

drm/panfrost: Fix inbalance of devfreq record_busy/idle()
authorSteven Price <steven.price@arm.com>
Fri, 22 May 2020 15:36:53 +0000 (16:36 +0100)
committerSteven Price <steven.price@arm.com>
Fri, 19 Jun 2020 09:59:58 +0000 (10:59 +0100)
commitb99773ef258e628bd53cab22d450a755b73b4d55
treea77147d70da0551aa82b8d9e29403bc28c6e7bb5
parentc8fa5b7c7a7e54ec64edc3904ee794b5ccf12b8b
drm/panfrost: Fix inbalance of devfreq record_busy/idle()

The calls to panfrost_devfreq_record_busy() and
panfrost_devfreq_record_idle() must be balanced to ensure that the
devfreq utilisation is correctly reported. But there are two cases where
this doesn't work correctly.

In panfrost_job_hw_submit() if pm_runtime_get_sync() fails or the
WARN_ON() fires then no call to panfrost_devfreq_record_busy() is made,
but when the job times out the corresponding _record_idle() call is
still made in panfrost_job_timedout(). Move the call up to ensure that
it always happens.

Secondly panfrost_job_timedout() only makes a single call to
panfrost_devfreq_record_idle() even if it is cleaning up multiple jobs.
Move the call inside the loop to ensure that the number of
_record_idle() calls matches the number of _record_busy() calls.

Fixes: 9e62b885f715 ("drm/panfrost: Simplify devfreq utilisation tracking")
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Signed-off-by: Steven Price <steven.price@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200522153653.40754-1-steven.price@arm.com
drivers/gpu/drm/panfrost/panfrost_job.c