From patchwork Mon Feb 20 09:47:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9582311 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 05C1460578 for ; Mon, 20 Feb 2017 09:47:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ECFEB27FBC for ; Mon, 20 Feb 2017 09:47:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E19F528173; Mon, 20 Feb 2017 09:47:20 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 851BB27FBC for ; Mon, 20 Feb 2017 09:47:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E5B946E1F8; Mon, 20 Feb 2017 09:47:19 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id EA69F6E1F4 for ; Mon, 20 Feb 2017 09:47:18 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id c85so13323915wmi.1 for ; Mon, 20 Feb 2017 01:47:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=ICbrjINdstXS3DVTsLfAk5HZ5CURvYU306tRFp51pIw=; b=rqgihqW1+CSTK4UM07gEDtw7Rabs36uWQ26bdlruyZ6pYPSOvX3UQRC8JC2pykMAHr dXwmlrH5M6hV2PckMWcTjyiqZ44khfjz6YQnn8DOwUPF9I2eD2chAZEcI+mhc2HUVnIu yo83AHkSZ+NOvA9pkAadaEGmhwcndlEDy0YNll7zLOUnIRFM0Tt8HIF1mVBV2OuE/DnT OmxCg34IBsnJz6C0yxrhtkAcibc0kqh66ueLrELsWVDdjnSi6epb2dshov6NpdfZ6UA/ MTJApMVqzNZHen1r9qeMon5z5eBamySd+8721I4uPOYDc1hj0bXb5vpSpSZUnW4ijD2c d1Eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=ICbrjINdstXS3DVTsLfAk5HZ5CURvYU306tRFp51pIw=; b=W16JU+WDzYjK2kk0lDHzx/2yYDoiTAtWmc20xyu2Ui6jwRP9A3DdeYvjhmjGLIyyxb 4Uwi0IidD+iYB2Jhw3WTgnRLVGHAJaxnE9KiPJZ64BivOGdHbyO6krubsZq5qrI2MNzV tZoZxFtUOBebV01Gqzl2ORqMNcXUR22lBRlchgvanNVliM6y6U1g9q0d8dhJB9wiQlIq mt4uJfshs5B+xQifTBKEcLSGnyeQX5NdhCM1SGVnjhhzQ8z+CvJdYJADfYSWp28RwFXI 2HA4XTs+9yPdKchnYkfmFpL0+2aZ++87yUUd2ZUNvMBTg257GA/y/VmXZoDacGzp1MAG A1yQ== X-Gm-Message-State: AMke39msMm0/olAva6XT3gK0uyQ1IJFAkXc6NiXCQryg7j+k1+JRgeDR7F0itqBQi6GLyA== X-Received: by 10.28.224.67 with SMTP id x64mr19413397wmg.20.1487584037642; Mon, 20 Feb 2017 01:47:17 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id g40sm24151174wrg.19.2017.02.20.01.47.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Feb 2017 01:47:17 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Mon, 20 Feb 2017 09:47:08 +0000 Message-Id: <20170220094713.22874-2-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170220094713.22874-1-chris@chris-wilson.co.uk> References: <20170220094713.22874-1-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH 2/7] drm/i915: Store the requested frequency whilst RPS is disabled X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP If intel_set_rps() is called whilst the hw is disabled, just store the requested frequency (from the user) for application when we wake the hw up. Signed-off-by: Chris Wilson Reviewed-by: Radoslaw Szwichtenberg --- drivers/gpu/drm/i915/intel_pm.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index e1878cb5d569..af11c4090c07 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -5105,6 +5105,11 @@ int intel_set_rps(struct drm_i915_private *dev_priv, u8 val) GEM_BUG_ON(val > dev_priv->rps.max_freq); GEM_BUG_ON(val < dev_priv->rps.min_freq); + if (!dev_priv->rps.enabled) { + dev_priv->rps.cur_freq = val; + return 0; + } + if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) err = valleyview_set_rps(dev_priv, val); else