drm/panfrost: Fix inbalance of devfreq record_busy/idle()

[linux-2.6-microblaze.git] / drivers / gpu / drm / panfrost / panfrost_job.c

diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c
index b2f09c0..ac87ef6 100644 (file)
--- a/drivers/gpu/drm/panfrost/panfrost_job.c
+++ b/drivers/gpu/drm/panfrost/panfrost_job.c
@@ -145,6 +145,8 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js)
        u64 jc_head = job->jc;
        int ret;
 
+       panfrost_devfreq_record_busy(pfdev);
+
        ret = pm_runtime_get_sync(pfdev->dev);
        if (ret < 0)
                return;
@@ -155,7 +157,6 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js)
        }
 
        cfg = panfrost_mmu_as_get(pfdev, &job->file_priv->mmu);
-       panfrost_devfreq_record_busy(pfdev);
 
        job_write(pfdev, JS_HEAD_NEXT_LO(js), jc_head & 0xFFFFFFFF);
        job_write(pfdev, JS_HEAD_NEXT_HI(js), jc_head >> 32);
@@ -410,12 +411,12 @@ static void panfrost_job_timedout(struct drm_sched_job *sched_job)
        for (i = 0; i < NUM_JOB_SLOTS; i++) {
                if (pfdev->jobs[i]) {
                        pm_runtime_put_noidle(pfdev->dev);
+                       panfrost_devfreq_record_idle(pfdev);
                        pfdev->jobs[i] = NULL;
                }
        }
        spin_unlock_irqrestore(&pfdev->js->job_lock, flags);
 
-       panfrost_devfreq_record_idle(pfdev);
        panfrost_device_reset(pfdev);
 
        for (i = 0; i < NUM_JOB_SLOTS; i++)