From patchwork Thu May 26 08:52:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9136815 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 B8D10607D5 for ; Thu, 26 May 2016 08:53:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE7BB27D11 for ; Thu, 26 May 2016 08:53:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A32D428299; Thu, 26 May 2016 08:53:08 +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]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6287B27D11 for ; Thu, 26 May 2016 08:53:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4475F6EA4E; Thu, 26 May 2016 08:53:04 +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 1BC3E6EA4A for ; Thu, 26 May 2016 08:52:54 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id q62so3167780wmg.3 for ; Thu, 26 May 2016 01:52:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=0ltfKdrfnI+IhkeyVxVAUHyM/4qkGUoNa/m60IvZ+ZY=; b=ec+9XGC0RbKSte+BsUXtuqBCXfvueCBjlpBKuqrEwK6ahgK8d2Y+ER2r2gs6F5Mqi5 RKLELCqQkljcbmsdzOPqEgSVMrunkRHB/XAfWcL5YrhAaZU5jGdiqgGJooHNl4z9gmqu 6uhkX02HDm4WWjQnXaX7SACMykI539TBeNVjCq2+oN+BwM0jp5JpOsr7F2TW2UnqQ9af fVUmo5lnKfAII/iuJDwxuYbGNOTY0bQxb9vD5yXBVjSgBcIkn055NPBYVKshU4Bb4zJW Yzj+PH9noBpSZ+MrRqXdaJS8FgUxPXSSsM6v9M4Ts/1fy6chEHK+l19hvSbT6F0xBd2U pMnQ== 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:cc:subject:date:message-id :in-reply-to:references; bh=0ltfKdrfnI+IhkeyVxVAUHyM/4qkGUoNa/m60IvZ+ZY=; b=JR8R9B+hfNx+NDD8CNWeXCql6tBxnYb5SthycRyKAn+nMLWr3azt8bfTX8b7s08eba 8Yh4cZJeAoEZKxjTlrPBYl385v6Tu7BimR4vEL3DMbk855NPTjBxXAFMU7sW0L6xg1ym CZXP4cEiXQ5fms8Mpe9R0glcNa76HaYUsW5TTnb8wiUPddeDCpB4ZS3of1G8fWtm8VGE iTJIwcoMkm+9RBMydc8kc1zkeyRrh0B6St3635yLaLMq1oeU5iUcdFtlirDbFsVQJagt btvTDcde0Ko8GhMQgJpW1RcIWxYwJqhn2cKHuhqYsMV0ypeT2b9My6aFIsl2AqdJmx1l GwSw== X-Gm-Message-State: ALyK8tJXz7TNUn8j39qdCJXlbsU38l5FLP2+O1HFLLjE984k/QG1+GtmBZjccRz9aRdOkQ== X-Received: by 10.28.87.131 with SMTP id l125mr2276996wmb.51.1464252772375; Thu, 26 May 2016 01:52:52 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id y1sm11214943wjg.10.2016.05.26.01.52.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 May 2016 01:52:51 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Thu, 26 May 2016 09:52:34 +0100 Message-Id: <1464252760-23902-5-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1464252760-23902-1-git-send-email-chris@chris-wilson.co.uk> References: <1464252760-23902-1-git-send-email-chris@chris-wilson.co.uk> Cc: Mika Kuoppala Subject: [Intel-gfx] [PATCH v3 04/10] drm/i915: Mark all default contexts as uninitialised after context loss 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 When the GPU is reset or state lost through suspend, every default legacy context needs to reload their state - both the golden render state and the L3 mapping. Only context images explicitly saved to memory (i.e. all execlists and non-default legacy contexts) will retain their state across the reset. Signed-off-by: Chris Wilson Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/i915/i915_gem_context.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 46cb2c7fd158..7f29c8eb750a 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -437,6 +437,20 @@ void i915_gem_context_lost(struct drm_i915_private *dev_priv) } /* Force the GPU state to be restored on enabling */ + if (!i915.enable_execlists) { + struct i915_gem_context *ctx; + + list_for_each_entry(ctx, &dev_priv->context_list, link) { + if (!i915_gem_context_is_default(ctx)) + continue; + + for_each_engine(engine, dev_priv) + ctx->engine[engine->id].initialised = false; + + ctx->remap_slice = ALL_L3_SLICES(dev_priv); + } + } + for_each_engine(engine, dev_priv) { struct intel_context *ce = &dev_priv->kernel_context->engine[engine->id]; @@ -444,7 +458,6 @@ void i915_gem_context_lost(struct drm_i915_private *dev_priv) ce->initialised = !i915.enable_execlists || engine->init_context == NULL; } - dev_priv->kernel_context->remap_slice = ALL_L3_SLICES(dev_priv); } void i915_gem_context_fini(struct drm_device *dev)