From patchwork Mon Oct 10 12:50:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9369457 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 9910C607D2 for ; Mon, 10 Oct 2016 12:50:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88EDF298B4 for ; Mon, 10 Oct 2016 12:50:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B0B02996F; Mon, 10 Oct 2016 12:50: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.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 355412994F for ; Mon, 10 Oct 2016 12:50:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DD7936E504; Mon, 10 Oct 2016 12:50:26 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-lf0-x241.google.com (mail-lf0-x241.google.com [IPv6:2a00:1450:4010:c07::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 40B196E504 for ; Mon, 10 Oct 2016 12:50:25 +0000 (UTC) Received: by mail-lf0-x241.google.com with SMTP id l131so9830816lfl.0 for ; Mon, 10 Oct 2016 05:50:25 -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; bh=RUP2YVoykAbpwwxKfszZI2KC+N40W5aHPCWtPhlmQfY=; b=t0gp1EAdrMzy/oabw8iwfKWtCke6UP6C1EY6LrUdq5eMCJ9yzkajK5rELLEjhNI1Tm SEV87FSOwjgPRN6HVPnoJMRuzhfDiet5/duxR7big8yvYOJZP5Rg99YX+CpHBdit2qrV DznvlTjWGBMsV9TLUfwswh6v9ixbeu2pkp9VZYLhH5MyEkD3YW1k6Fwc5s6oHp+EdFNP INufkX1QL8bBPk9AFFbbF4dqb9DVE/H7Wm3N11t7M3wH3qrW4zBoEZLT9FhtsHlwtO12 f3avmXhrVgoKYTCr2YgjJaLwfbiJu6HFNy/nb+WRPSzWAyqIQN4Q/bVoBtgv8X1N2shq CHlA== 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; bh=RUP2YVoykAbpwwxKfszZI2KC+N40W5aHPCWtPhlmQfY=; b=XIEr59FMGuNGkZhzwS5I+d4PzVybfH6aDbKJLGX/eq5RZLJGLT0xru5zLxdeWLHVuJ FNXAjWhwDGXQIewTtddIcO3YUH+KFXNoU/SR+L6ZwSx0rJyMvqLX/Mcz3JL3nkEWQJMU OvG21gAqzSiXF4n50Wztxa0fYZh98bgZ3gjhbAmUzjghsznFR4P3xwYFb30ZgbIYA8hP R5OSD3qKdgpPij2s7lOEyaZ8EL/DFRmEgeO0cwPos4frJLYjlWDaUW+eQWVgORWDkCMN 0jEfSEr3HVLgVE2H9A9fQPl434ysOLff9GGjqvq2FjIe4JO2OP076pFUuIfK54EJ/Q/F Zx6A== X-Gm-Message-State: AA6/9RlxOoEr/pjVUnOlneTJPjTxjgrgCYiZz4YlKQ+E9w0h2AriPcgxsxuRTu6r5L2HJA== X-Received: by 10.194.173.1 with SMTP id bg1mr13983254wjc.119.1476103823251; Mon, 10 Oct 2016 05:50:23 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id bl3sm39829540wjc.26.2016.10.10.05.50.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Oct 2016 05:50:22 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Mon, 10 Oct 2016 13:50:17 +0100 Message-Id: <20161010125017.23911-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.9.3 Cc: Jani Nikula , Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: Fix silent conflict from backmerge of drm-next into dinf 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 Merging from drm-next pulled back in a few lines of dead code due to the code movement around i915_gem_reset(), fix that up. Signed-off-by: Chris Wilson Cc: Jani Nikula Cc: Daniel Vetter --- drivers/gpu/drm/i915/i915_gem.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 981a106901ae..1418c1c522cb 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2616,8 +2616,6 @@ static void i915_gem_reset_engine(struct intel_engine_cs *engine) list_for_each_entry_continue(request, &engine->request_list, link) if (request->ctx == incomplete_ctx) reset_request(request); - - engine->i915->gt.active_engines &= ~intel_engine_flag(engine); } void i915_gem_reset(struct drm_i915_private *dev_priv) @@ -2628,7 +2626,6 @@ void i915_gem_reset(struct drm_i915_private *dev_priv) for_each_engine(engine, dev_priv) i915_gem_reset_engine(engine); - mod_delayed_work(dev_priv->wq, &dev_priv->gt.idle_work, 0); i915_gem_restore_fences(&dev_priv->drm);