From patchwork Sun Aug 21 06:20:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sagar.a.kamble@intel.com X-Patchwork-Id: 9292011 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 B9C95600CB for ; Sun, 21 Aug 2016 06:18:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE23228B9B for ; Sun, 21 Aug 2016 06:18:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A342728BC2; Sun, 21 Aug 2016 06:18:30 +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.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED 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 42FBD28B9B for ; Sun, 21 Aug 2016 06:18:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C5FB96E2E1; Sun, 21 Aug 2016 06:18:29 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id A4BDF6E2C2 for ; Sun, 21 Aug 2016 06:18:26 +0000 (UTC) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP; 20 Aug 2016 23:18:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,553,1464678000"; d="scan'208";a="187606" Received: from sakamble-desktop.iind.intel.com ([10.223.82.59]) by fmsmga006.fm.intel.com with ESMTP; 20 Aug 2016 23:18:25 -0700 From: Sagar Arun Kamble To: intel-gfx@lists.freedesktop.org Date: Sun, 21 Aug 2016 11:50:14 +0530 Message-Id: <1471760418-27509-22-git-send-email-sagar.a.kamble@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1471760418-27509-1-git-send-email-sagar.a.kamble@intel.com> References: <1471669765-5935-1-git-send-email-sagar.a.kamble@intel.com> <1471760418-27509-1-git-send-email-sagar.a.kamble@intel.com> Subject: [Intel-gfx] drm/i915: Mark GuC load status as PENDING in i915_drm_resume_early 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 This will help avoid Host to GuC actions being called till GuC gets loaded during i915_drm_resume. Signed-off-by: Sagar Arun Kamble --- drivers/gpu/drm/i915/i915_drv.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index d5d0a50..627d223 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1629,6 +1629,7 @@ static int i915_drm_resume(struct drm_device *dev) static int i915_drm_resume_early(struct drm_device *dev) { struct drm_i915_private *dev_priv = to_i915(dev); + struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; int ret; /* @@ -1685,6 +1686,12 @@ static int i915_drm_resume_early(struct drm_device *dev) DRM_ERROR("Resume prepare failed: %d, continuing anyway\n", ret); + /* + * Mark GuC FW load status as PENDING to avoid any Host to GuC actions + * invoked till GuC gets loaded in i915_drm_resume. + */ + guc_fw->guc_fw_load_status = GUC_FIRMWARE_PENDING; + intel_uncore_early_sanitize(dev_priv, true); if (IS_BROXTON(dev_priv)) {