From patchwork Mon Jan 23 12:14:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9532383 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 769D060434 for ; Mon, 23 Jan 2017 12:14:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 571F7282EC for ; Mon, 23 Jan 2017 12:14:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4C2DA2831B; Mon, 23 Jan 2017 12:14:38 +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 00CB7282EC for ; Mon, 23 Jan 2017 12:14:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B298E6E51F; Mon, 23 Jan 2017 12:14:36 +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 A928B6E51B for ; Mon, 23 Jan 2017 12:14:34 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id r144so25989147wme.0 for ; Mon, 23 Jan 2017 04:14:34 -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=/HgJgEzOSVEsv5/A62gdv2XNjos03rEsOwQX7K1dGxs=; b=VSa3srCo63ZXdcSsS5AJcQiRf4IMzq33ks/6uAoCEZTVB+HJAJW+aPRX6govafxH9q qEhgtrNB5I+A4WhGUxyo7KAAjRYwwicus3I/x9RlSan/Y+CRUJfPRm3hQ63UlX2Qwmsx SRajH20gGLUXIXEu3Vh22zOn3XVeh+wNK1Bpy5215P+dVpoYivYUDyWMi7/HRDiOunvv 557ykmIan2XDJCHK8UYeOWuujcWQcVB09BFU3wwXILta+h3w0QQfqoHdpmDhFUw4oETg lvDUlsJVFkhQ6L/4yAeZvzIeqVsVa2fh6dnB6g0Z3nBjyO4i5+5YX81hDGTEd/W51XSY z/Qg== 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=/HgJgEzOSVEsv5/A62gdv2XNjos03rEsOwQX7K1dGxs=; b=XZGg7/OWMj2HUgelqZqaMXeeEVYaWwQ7Yd+5LuDVULIOg6pi8AgdWTv2/HiGfk0brl 6xKLco0yYY8eNFUh6d3seTmHDwu1G/XILV4aJwfoMattdXzVXEQxQ7m2Kmb80iPUIoUw f+iCjsM9lti4pExbLvSq1rcUb/4f6H2MoCqIM5AFN1h52c8fL4ehaHiRjINBJgsfUXtj W5XmssYNppYEmGeKSCnplALdDQJ4vgxKe0jR+/SdhElpaLkvZxjVt4zw9jtBIZv9FgZI 6K4fXRHJezW9lsfHUcqcfjn2eSb7I896YyjpN63MwynQS2Lzy3/myXrioZ33M9pA2clj zThg== X-Gm-Message-State: AIkVDXLU25Slg4UvFofb1pDa7hZZKef7tmB5BzZvSFwhy0Th/FJcv7ohclrn7uuTIGyR8Q== X-Received: by 10.28.74.69 with SMTP id x66mr12666690wma.124.1485173673312; Mon, 23 Jan 2017 04:14:33 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id o42sm14363813wrb.18.2017.01.23.04.14.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jan 2017 04:14:32 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Mon, 23 Jan 2017 12:14:26 +0000 Message-Id: <20170123121429.13399-2-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170123121429.13399-1-chris@chris-wilson.co.uk> References: <20170123121429.13399-1-chris@chris-wilson.co.uk> Cc: mika.kuoppala@intel.com Subject: [Intel-gfx] [PATCH v2 2/5] drm/i915: Only run execlist context-switch handler after an interrupt 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 Mark when we run the execlist tasklet following the interrupt, so we don't probe a potentially initialised register when submitting the contexts multiple times. Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/i915_irq.c | 7 +++++-- drivers/gpu/drm/i915/intel_lrc.c | 3 ++- drivers/gpu/drm/i915/intel_ringbuffer.h | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 6fefc34ef602..42be116dd33d 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1349,8 +1349,11 @@ gen8_cs_irq_handler(struct intel_engine_cs *engine, u32 iir, int test_shift) { if (iir & (GT_RENDER_USER_INTERRUPT << test_shift)) notify_ring(engine); - if (iir & (GT_CONTEXT_SWITCH_INTERRUPT << test_shift)) - tasklet_schedule(&engine->irq_tasklet); + + if (iir & (GT_CONTEXT_SWITCH_INTERRUPT << test_shift)) { + set_bit(IRQ_CTX_SWITCH, &engine->irq_tasklet.state); + tasklet_hi_schedule(&engine->irq_tasklet); + } } static irqreturn_t gen8_gt_irq_ack(struct drm_i915_private *dev_priv, diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 873c3a8a580b..d2adfc77260a 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -577,7 +577,7 @@ static void intel_lrc_irq_handler(unsigned long data) intel_uncore_forcewake_get(dev_priv, engine->fw_domains); - if (!execlists_elsp_idle(engine)) { + while (test_and_clear_bit(IRQ_CTX_SWITCH, &engine->irq_tasklet.state)) { u32 __iomem *csb_mmio = dev_priv->regs + i915_mmio_reg_offset(RING_CONTEXT_STATUS_PTR(engine)); u32 __iomem *buf = @@ -1346,6 +1346,7 @@ static int gen8_init_common_ring(struct intel_engine_cs *engine) DRM_DEBUG_DRIVER("Execlists enabled for %s\n", engine->name); /* After a GPU reset, we may have requests to replay */ + clear_bit(IRQ_CTX_SWITCH, &engine->irq_tasklet.state); if (!execlists_elsp_idle(engine)) { engine->execlist_port[0].count = 0; engine->execlist_port[1].count = 0; diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index 34cdbb6350a8..c63f39d47fdd 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h @@ -373,6 +373,7 @@ struct intel_engine_cs { /* Execlists */ struct tasklet_struct irq_tasklet; +#define IRQ_CTX_SWITCH (BITS_PER_LONG - 1) /* TASKLET_STATE_USER */ struct execlist_port { struct drm_i915_gem_request *request; unsigned int count;