From patchwork Wed May 18 09:50:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9117611 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 17A41BF29F for ; Wed, 18 May 2016 09:51:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5A00D20212 for ; Wed, 18 May 2016 09:51:08 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id DC468202AE for ; Wed, 18 May 2016 09:51:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 02D746E835; Wed, 18 May 2016 09:51:04 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id B3BE56E831 for ; Wed, 18 May 2016 09:51:00 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id r12so11403848wme.0 for ; Wed, 18 May 2016 02:51:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=45IV115nhtUQCX7zNnNXrNh1q0biCd/QwcxxKvRwdx0=; b=khOY5COU+XutLO+hvAw2MtyVs81t1cByRNqE1tpDsMB4cy0FZOjXBelytSLZf4xJ5f EC6cgIB3RmuSTN1wfiNSbDxJfJEgLNgtthcu9uulTsgz2/92mrfjrkW+24o/uny+ZFc9 7iAZ3XqC0YEKvQ0EcLsUrb2UCKB/rOVlfFR9Qn6+/vWwqC6Juxbre+VK8zmP7Ju1pPYK JnkS3LxvOiZABYLdyCAeBjEau8Xw0U1uHCGSvX6srzjJ44e8if4fTHIF12EvslR1One4 x1OkZllDbPkHCbDGHG3yxjEfn1k2E5ww8QA8RVZGa9Yyt4bxh+/4RywHCV7yTlKiq0XY Es5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=45IV115nhtUQCX7zNnNXrNh1q0biCd/QwcxxKvRwdx0=; b=CzmvhHIzE0gVWjZw1Pv+ZBgfPWeUuYNnnwV/FvFO/Ozcyaw32jHHrWVFCxekywljdZ F3SsfHO/4xNrXOCn65t6KC4BaI1e8ENI9hoI+qLDHVg07Sretz5vrJpqQab8NTQ0cUGH 0UrTeCOv4HAdwiINkipO6OwsSaeSXO23OPKvB4QPrXtjWASKoQkZgGBmERKshbH4dIzD pHy6iRF29g7JOfkSdLonGzfeGZh29szeCO0AXVvwiLsocCm26Cfh97+MRoGbX9BGo7U5 V9Ulp4l+AG7vWGxLkAClxWbgaflqpJqvvszT63eHOBKV1l1Zi4P78ffZ0nJGjazTi6n/ pb3Q== X-Gm-Message-State: AOPr4FUg1BToaXtNKZ5lxBDlTbx/E8AiWa1Xg7C6BsJ/ml4rTTJcIqY7JXLoS18LDNiT3w== X-Received: by 10.194.133.135 with SMTP id pc7mr6277213wjb.49.1463565059120; Wed, 18 May 2016 02:50:59 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id d20sm28728327wmd.12.2016.05.18.02.50.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 May 2016 02:50:57 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Wed, 18 May 2016 10:50:46 +0100 Message-Id: <1463565047-32149-7-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1463565047-32149-1-git-send-email-chris@chris-wilson.co.uk> References: <1463565047-32149-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [CI 7/8] move-opregion-setup 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-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP --- drivers/gpu/drm/i915/i915_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 44c4743770ed..8b4f26b82e62 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -857,6 +857,8 @@ static void intel_kms_resume(void *data, async_cookie_t cookie) struct resume_context *ctx = data; struct drm_device *dev = ctx->i915->dev; + intel_opregion_setup(dev); + intel_init_pch_refclk(dev); drm_mode_config_reset(dev); @@ -901,7 +903,6 @@ static int i915_drm_resume(struct drm_device *dev) intel_csr_ucode_resume(ctx->i915); i915_restore_state(dev); - intel_opregion_setup(dev); ctx->cookie = async_schedule_domain(intel_kms_resume, resume_context_get(ctx),