From patchwork Thu Dec 20 14:16:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 10738957 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2488D13AD for ; Thu, 20 Dec 2018 14:17:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 148102881C for ; Thu, 20 Dec 2018 14:17:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0894528960; Thu, 20 Dec 2018 14:17:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE5132881C for ; Thu, 20 Dec 2018 14:17:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732680AbeLTORE (ORCPT ); Thu, 20 Dec 2018 09:17:04 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:35841 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731194AbeLTORE (ORCPT ); Thu, 20 Dec 2018 09:17:04 -0500 Received: by mail-wm1-f65.google.com with SMTP id p6so2371065wmc.1 for ; Thu, 20 Dec 2018 06:17:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=dl0vWZ2OmuLRkr6rXUIz7t6LbyxfogMj8WkEhaEhsA0=; b=b9k/Hf8kAni+gkKuoX2ym92n5HEjdT1XxxzZEnhXqz4HBR/UWmLNTNR65gknoyaiPS KQ7vdCJft5lHDbGZMc+hB1IcrMbr5rLQAhONL4CdHHRRF12Qfd0KfbnEFPOhHum+QSRf IXsUzEhArcfQkxTl9/q008nk/WHsIa0GS6ciY= 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; bh=dl0vWZ2OmuLRkr6rXUIz7t6LbyxfogMj8WkEhaEhsA0=; b=ZZGgSZt5iOoGj+sqA5vRMCwNMUIPLSbhWDgOYB92HTk+DeClAN7ujhLqEAFRdhlYJr jeeMkLFy66Kph8IDepQSfWf+UQgsA5rhE7/r7iTVTdI0opJP8CPotQSnAe7mPiYUB6Zi 2O5ifYNBJZlc5tg8Ikyr8BYjKq+8iYtA5RneJpeagD2JMd/CAhaSX6AZ6Btkol651e22 CRdua42lFAbKQ+kIOs9rG45adUTwOc9xDzL1npd77iJlWCihSMX5mrEqiDHq8Cn+z8ce MF+6traZ0IXemeniBbLUQagp6iwEWZ2IbY9+0TFI13jzBI6gI7ROR/ookn2Q/xGYdd1c QocA== X-Gm-Message-State: AA+aEWaccXbMdefAADDfYm2K9LiZbmh9pB16Y1S0Z6AJYVeKnjWRudas gQXiJVh3kKIK6ys6j+rxtdNQXqXeBkAoGA== X-Google-Smtp-Source: AFSGD/UNrjs/0zRvq0PN+NwLus3oyFp12NHZqRJ3E0lyn8bH8ARB6+LrmxNY9dWK2HJNuuvGzxKNpw== X-Received: by 2002:a1c:128b:: with SMTP id 133mr12239546wms.22.1545315421678; Thu, 20 Dec 2018 06:17:01 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:f:6020:f9b3:37c1:b11a:64ce]) by smtp.gmail.com with ESMTPSA id v132sm7855024wme.20.2018.12.20.06.17.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Dec 2018 06:17:00 -0800 (PST) From: Vincent Guittot To: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, rjw@rjwysocki.net, thara.gopinath@linaro.org, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, airlied@linux.ie, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: ulf.hansson@linaro.org, Vincent Guittot Subject: [PATCH v4 2/3] drm/i915: Move on the new pm runtime interface Date: Thu, 20 Dec 2018 15:16:57 +0100 Message-Id: <1545315417-14483-1-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use the new pm runtime interface to get the accounted suspended time: pm_runtime_accounted_time_get() Signed-off-by: Vincent Guittot Reviewed-by: Ulf Hansson --- drivers/gpu/drm/i915/i915_pmu.c | 16 ++++++---------- drivers/gpu/drm/i915/i915_pmu.h | 4 ++-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c index d6c8f8f..3f76f60 100644 --- a/drivers/gpu/drm/i915/i915_pmu.c +++ b/drivers/gpu/drm/i915/i915_pmu.c @@ -5,6 +5,7 @@ */ #include +#include #include "i915_pmu.h" #include "intel_ringbuffer.h" #include "i915_drv.h" @@ -478,7 +479,6 @@ static u64 get_rc6(struct drm_i915_private *i915) * counter value. */ spin_lock_irqsave(&i915->pmu.lock, flags); - spin_lock(&kdev->power.lock); /* * After the above branch intel_runtime_pm_get_if_in_use failed @@ -491,16 +491,13 @@ static u64 get_rc6(struct drm_i915_private *i915) * suspended and if not we cannot do better than report the last * known RC6 value. */ - if (kdev->power.runtime_status == RPM_SUSPENDED) { - if (!i915->pmu.sample[__I915_SAMPLE_RC6_ESTIMATED].cur) - i915->pmu.suspended_jiffies_last = - kdev->power.suspended_jiffies; + if (pm_runtime_status_suspended(kdev)) { + val = pm_runtime_suspended_time(kdev); - val = kdev->power.suspended_jiffies - - i915->pmu.suspended_jiffies_last; - val += jiffies - kdev->power.accounting_timestamp; + if (!i915->pmu.sample[__I915_SAMPLE_RC6_ESTIMATED].cur) + i915->pmu.suspended_time_last = val; - val = jiffies_to_nsecs(val); + val -= i915->pmu.suspended_time_last; val += i915->pmu.sample[__I915_SAMPLE_RC6].cur; i915->pmu.sample[__I915_SAMPLE_RC6_ESTIMATED].cur = val; @@ -510,7 +507,6 @@ static u64 get_rc6(struct drm_i915_private *i915) val = i915->pmu.sample[__I915_SAMPLE_RC6].cur; } - spin_unlock(&kdev->power.lock); spin_unlock_irqrestore(&i915->pmu.lock, flags); } diff --git a/drivers/gpu/drm/i915/i915_pmu.h b/drivers/gpu/drm/i915/i915_pmu.h index 7f164ca..3dc2a30 100644 --- a/drivers/gpu/drm/i915/i915_pmu.h +++ b/drivers/gpu/drm/i915/i915_pmu.h @@ -95,9 +95,9 @@ struct i915_pmu { */ struct i915_pmu_sample sample[__I915_NUM_PMU_SAMPLERS]; /** - * @suspended_jiffies_last: Cached suspend time from PM core. + * @suspended_time_last: Cached suspend time from PM core. */ - unsigned long suspended_jiffies_last; + u64 suspended_time_last; /** * @i915_attr: Memory block holding device attributes. */