From patchwork Fri Aug 23 02:12:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 172081 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1813ily; Thu, 22 Aug 2019 19:12:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqyUobxbnfohJaGpdFASyXVc3XMxy9buSUoithY7D3vOV+gfjBgKmPjrcQTWRrXr6xdu0pUa X-Received: by 2002:a62:5207:: with SMTP id g7mr2532850pfb.152.1566526362621; Thu, 22 Aug 2019 19:12:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566526362; cv=none; d=google.com; s=arc-20160816; b=wtRw049LQBkb4mFVmU2hF5TerO+GPDgNyhSb+vSZZ5I0e+OYf/Mb99PH+h/Vw9jcuX LlJAZ+rzgY1yqthdl71mbEm0R+Rs3F1y9tb+J0cw440hK6YPHOXiMfr9zWexH7EPthRS pwsVeduhe3hRZlxz7G3fDpekv/pVWWoOG5SdQoTaLGEbcckCi8UBg57fRBB8ke0MiPgi rv8iP10R/Cwig2u+nGBSyqlWY8g2Xlxn5/DrHJhMD9RAXVFlrN2XJ5aPJ8fpmCInesdv pSxz9AWQQTCHCMm0fZ4QfrCENfIzSkgOhvF2ylujKvHMguxOZ7Y+VfaIQ8xkAhKdmBwm 2PYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:delivered-to; bh=aLfLr1+WwjRYQS/V+DL46E7Y+uHiMOlFAHiDoOM5MIY=; b=A5tT9uVNu/EUI1Pt1BdWGnscvP81dYsVcNPAIp4ddsRfhmUTh3AjLp1AYrG3mqjrRo RZvhHSS5tqNDCFUtgt75xsESz1u+mV29KGjTxmia/BHX+R/fCujWSdeTZbbpdz5O0YNC cwsrmjDwLEqndJq9VrfPNi0oZkEJCy2hMIBSB3rJmnQ72QdD6dJj7xs5Y0rQDUl2t5Am CCuhMy7NSXgeC6jsICoqnmz3mgSi9xRtYyY4VORFAsQNgSvzJrgw1Yo0rY0/sNlNFNJi /RuAq6zK4JH+6LH90CRPGwGXpw7iQ2i2zl/YAzOH0UEtHGb1wGlIp2F1VmsC2BTAYCZf qwZw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id h25si1193651pfn.56.2019.08.22.19.12.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Aug 2019 19:12:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5C8816EBAA; Fri, 23 Aug 2019 02:12:39 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-oi1-f195.google.com (mail-oi1-f195.google.com [209.85.167.195]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3F5686EB21 for ; Fri, 23 Aug 2019 02:12:23 +0000 (UTC) Received: by mail-oi1-f195.google.com with SMTP id l2so5938468oil.0 for ; Thu, 22 Aug 2019 19:12:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=k+NTlGr0d+34j78gJ1Mf4qbMv8Jq5bw97eaaB6YOzMs=; b=JWsXboN9HFM4o6+2Y1ad2KtW0INYTtdu6oW08DaDtn0mwSjZ8yTOQicv+XkExIV7Zp k80BYci+ylqOIXighVlygELESViMy/Wvo9S/AzpoB3X3PQnVr8A2KAHXbT9NtQUsFvU8 c8TFQAEx8lCPWr3C+xGP+YqkMDa8Uz1UVreXn3I8aWdHvc93OYkMOmWfrJ4NtXsbI2tD om375rYvqCMEGFNMz0f4hjc7MJV79NFJHi044OuGF/SyQkKcL3o5Fj/aGOd1yrvz9/X3 1J+jMjSDNuJx1dYmT+o7xv2ULMzvbj7HFXGbuqMBhoa7uvtrD7Dlw6kdeCVPUdtKxVZc Tk/Q== X-Gm-Message-State: APjAAAXkZpFL3/4Mavsdd2iFQsyh4q0PTao6znahWXzpNSwR3CU2/vIL TNb96PO6+OoTWXdK2JV54MrVvXo= X-Received: by 2002:aca:cd12:: with SMTP id d18mr1577251oig.68.1566526342081; Thu, 22 Aug 2019 19:12:22 -0700 (PDT) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id c1sm457747oic.31.2019.08.22.19.12.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Aug 2019 19:12:21 -0700 (PDT) From: Rob Herring To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 3/8] drm/panfrost: Hold runtime PM reference until jobs complete Date: Thu, 22 Aug 2019 21:12:11 -0500 Message-Id: <20190823021216.5862-4-robh@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190823021216.5862-1-robh@kernel.org> References: <20190823021216.5862-1-robh@kernel.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxime Ripard , Tomeu Vizoso , David Airlie , Sean Paul , Steven Price , Boris Brezillon , Alyssa Rosenzweig , Robin Murphy Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Doing a pm_runtime_put as soon as a job is submitted is wrong as it should not happen until the job completes. It works because we are relying on the autosuspend timeout to keep the h/w enabled. Cc: Tomeu Vizoso Cc: Steven Price Cc: Alyssa Rosenzweig Cc: David Airlie Cc: Daniel Vetter Signed-off-by: Rob Herring --- v2: new patch drivers/gpu/drm/panfrost/panfrost_job.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c index 05c85f45a0de..80c9cab9a01b 100644 --- a/drivers/gpu/drm/panfrost/panfrost_job.c +++ b/drivers/gpu/drm/panfrost/panfrost_job.c @@ -151,7 +151,7 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js) return; if (WARN_ON(job_read(pfdev, JS_COMMAND_NEXT(js)))) - goto end; + return; cfg = panfrost_mmu_as_get(pfdev, &job->file_priv->mmu); @@ -187,10 +187,6 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js) job_write(pfdev, JS_COMMAND_NEXT(js), JS_COMMAND_START); spin_unlock_irqrestore(&pfdev->hwaccess_lock, flags); - -end: - pm_runtime_mark_last_busy(pfdev->dev); - pm_runtime_put_autosuspend(pfdev->dev); } static void panfrost_acquire_object_fences(struct drm_gem_object **bos, @@ -388,9 +384,13 @@ static void panfrost_job_timedout(struct drm_sched_job *sched_job) mutex_lock(&pfdev->reset_lock); - for (i = 0; i < NUM_JOB_SLOTS; i++) + for (i = 0; i < NUM_JOB_SLOTS; i++) { drm_sched_stop(&pfdev->js->queue[i].sched, sched_job); - + if (pfdev->jobs[i]) { + pm_runtime_put_noidle(pfdev->dev); + pfdev->jobs[i] = NULL; + } + } if (sched_job) drm_sched_increase_karma(sched_job); @@ -455,7 +455,9 @@ static irqreturn_t panfrost_job_irq_handler(int irq, void *data) pfdev->jobs[j] = NULL; panfrost_mmu_as_put(pfdev, &job->file_priv->mmu); panfrost_devfreq_record_transition(pfdev, j); + dma_fence_signal(job->done_fence); + pm_runtime_put_autosuspend(pfdev->dev); } status &= ~mask;