From patchwork Sat Mar 18 10:28:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9632107 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 5C681602D6 for ; Sat, 18 Mar 2017 10:29:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 34DEE2836D for ; Sat, 18 Mar 2017 10:29:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 27E0D28429; Sat, 18 Mar 2017 10:29: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]) (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 9F3712836D for ; Sat, 18 Mar 2017 10:29:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1CDF96E064; Sat, 18 Mar 2017 10:29:06 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id A44556E064 for ; Sat, 18 Mar 2017 10:29:04 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id n11so6797810wma.0 for ; Sat, 18 Mar 2017 03:29:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=HeQ7XgvTTMf3ga6obnZK3srxQeQXRM8cNZQUyml3Y34=; b=EjtXLecncG0vqkcbGyFK3QJapH0bAfJq4BJoj2w0ZLLhLqXPBdjz4FjyW7eajrZ65r EuWVZv/8625qQ7D1I4w2vP6ApC6sAWIrSHX0yHgDc4eTM/AY+EZ548EleLznYK7vIF+K YxHelR+uaWul3uvwUEGAbiVy+wH8P2qbvs84dYLFwImXRu8AV3eKfPB7cvkz0rV5aDfA UuSwfpb2BCFIBsNWGltAoFdUxG/rSMTbzu8IUvFnhhIoFP0of9JyVhET2n/khLhpvj5k FdntV0MvYsD4pSb+m1jb/KWuE/0FCzF04+8IH46im9xtlZOUtnRUlv0rGzSUT2Jrlwy5 5fBw== 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 :mime-version:content-transfer-encoding; bh=HeQ7XgvTTMf3ga6obnZK3srxQeQXRM8cNZQUyml3Y34=; b=N4P2olv7eMxYgONU+66lKH8fuuHBx6+avqFnsmiV4+yZD1J6uD4v6ccj4+QHCC0aPf UmyiS35d3eK1H4LfHUwzEDpkQ4Co5CTms5XEIdWPOyUtpTFxQkjw47PK+1NdCP3a4oUw 1csYXqlMQ/WMRvOW+PPPRfvIlvLcHkdtZITJRV6sdXFwpBb0dJvrdMwYzD4UL8awZmhj /VkNt2IrtkY8byOGlk38UWvlpBd+Tr5mmjILzT3IsKcT5ZSf9q1ATzV8dYSvXU9Y2VWv 8pF4/wu1XyWA1AUaEEIFdIfoS06TpFOSjtcgxLTaH4DIvudjjDIquZQs4xMo591nTZl/ MSvA== X-Gm-Message-State: AFeK/H0Jy/qNlX58ts4C/sBO+IRkoacxmVoUymgFIfjlwU3G8jKIeuO85TNw1JhQi2wmLw== X-Received: by 10.28.27.14 with SMTP id b14mr2071475wmb.50.1489832943333; Sat, 18 Mar 2017 03:29:03 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id q74sm3898565wrb.68.2017.03.18.03.29.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Mar 2017 03:29:01 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Sat, 18 Mar 2017 10:28:59 +0000 Message-Id: <20170318102859.24101-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] drm/i915: Reset tasklet back to execlists after disabling guc 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP When switching back to execlists, we also now need to restore the tasklet handler. Reported-by: Oscar Mateo Fixes: 31de73501ac9 ("drm/i915/scheduler: emulate a scheduler for guc") Signed-off-by: Chris Wilson Cc: Tvrtko Ursulin Cc: Joonas Lahtinen Cc: Michał Winiarski Cc: Oscar Mateo Reviewed-by: Michał Winiarski --- 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 97dda0108a8c..df1d1c9eeb99 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -1578,6 +1578,7 @@ static void execlists_set_default_submission(struct intel_engine_cs *engine) { engine->submit_request = execlists_submit_request; engine->schedule = execlists_schedule; + engine->irq_tasklet.func = intel_lrc_irq_handler; } static void