From patchwork Tue Jan 24 11:00:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9534897 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 90F186042D for ; Tue, 24 Jan 2017 11:00:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 840D12094F for ; Tue, 24 Jan 2017 11:00:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 78E1026D05; Tue, 24 Jan 2017 11:00:16 +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 342DF2094F for ; Tue, 24 Jan 2017 11:00:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E82AF6E753; Tue, 24 Jan 2017 11:00:14 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id BAF9D6E743 for ; Tue, 24 Jan 2017 11:00:13 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id d140so33873453wmd.2 for ; Tue, 24 Jan 2017 03:00:13 -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; bh=wGtYQVhdrOj99FOWksWkLP9fq33OSKZgnKZxy6odH2Y=; b=i8YglbiBYMF1OsGl26iHtE3O9d8ZWGFg5bi7IGBFuSSxdc1TwbKIXaGJARQLZA+5PV 4kwNRMSb5MtuXMOzfYk8Tgy80PaIf9bMgzoYhaGNwEqE4MSEwjLvdE324TwnUX1WJQXR HXIIzuFSSpOotV9hxShvpI4ThRgXwVfS2YN6PSj3eU7cmZzMMiGCDyxMBrj91sBe1Lzk S+Z6wpPtruGAOgEeW7RHoFtaOalf+JG1aU1sKR+bC/ZOWtrV0UGx1YiOap+C5oZTL7LY w0U4h7RZyjfhEm8q4y5MEsccM+4fYWvdSnmrk2dcvBsjXy8Qmosb0KooqyIjXPvWnnNp SO8Q== 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; bh=wGtYQVhdrOj99FOWksWkLP9fq33OSKZgnKZxy6odH2Y=; b=qKWKH5Yr+uSHAWZsixtvrg5bxweAQF8Jswg7f2yv0eA7IMeICWaOvWzYg8VkIo7gKS uhwUTPQSQFh9TnVRTJdvHxo1E+6zg8VBgSjXrsxyPPPCm5afkshiQLKwJcjs+TXVq5gl REZZ1zSVPZbRxjQ4DiLMXCZZb81Pw4o+s/81rseLIkzSOIMSzWxXj0ZZieoZmpenPmBb CQ9Khc+kiKRR8/tIA/HlNOMDH6YRwfNAcKa61pKIvu3YSSFzA0RL4O6b3M+57so5SNV6 /bzrj7JlqYmIlCTql5qyc2zRuBFPM+ctHYT5TXY6i+shB3VdGrC9hSgVJHdJcWNxrcT8 IBoQ== X-Gm-Message-State: AIkVDXJOXp8F+IhC2A/jewmh3azcg6zIrm6kET8Zh473b/+ddlDcyVtCQSxgedSRqVoLcQ== X-Received: by 10.28.74.221 with SMTP id n90mr16292564wmi.114.1485255612176; Tue, 24 Jan 2017 03:00:12 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id x69sm11857573wma.15.2017.01.24.03.00.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Jan 2017 03:00:11 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Tue, 24 Jan 2017 11:00:02 +0000 Message-Id: <20170124110009.28947-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 Subject: [Intel-gfx] [PATCH v3 1/8] drm/i915: Assert that we don't submit to execlists whilst a preempt is pending 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 To complement the check in execlists_elsp_ready(), also assert that we don't submit the same context while it has a lite restore still pending. Signed-off-by: Chris Wilson Reviewed-by: Mika Kuoppala --- drivers/gpu/drm/i915/intel_lrc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 32096d141d57..9dd612a2df16 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -375,6 +375,7 @@ static void execlists_submit_ports(struct intel_engine_cs *engine) dev_priv->regs + i915_mmio_reg_offset(RING_ELSP(engine)); u64 desc[2]; + GEM_BUG_ON(port[0].count > 1); if (!port[0].count) execlists_context_status_change(port[0].request, INTEL_CONTEXT_SCHEDULE_IN);