From patchwork Tue Aug 18 11:36:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marcin_=C5=9Alusarz?= X-Patchwork-Id: 11720579 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8D9D51392 for ; Tue, 18 Aug 2020 11:40:42 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6C25B20578 for ; Tue, 18 Aug 2020 11:40:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Y8hjTd6s" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6C25B20578 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 042E489BF3; Tue, 18 Aug 2020 11:40:42 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-io1-xd43.google.com (mail-io1-xd43.google.com [IPv6:2607:f8b0:4864:20::d43]) by gabe.freedesktop.org (Postfix) with ESMTPS id D8FFD89BE8 for ; Tue, 18 Aug 2020 11:40:40 +0000 (UTC) Received: by mail-io1-xd43.google.com with SMTP id s189so20851147iod.2 for ; Tue, 18 Aug 2020 04:40:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to:cc :content-transfer-encoding; bh=8EHythZyqcSYqnIyrsV3flqqgX5tPkZwghcXZdsresE=; b=Y8hjTd6so4XZX8VgzlI56QQSrgiPh7wks0KLFUjBQDyGk3d22QJTSUdEWAx8Kco/N0 DExwL2qlfgSMdf3cq6TeuFkxohVzL2LH2kWMQSS6L7HKqtaLR1IPiYOeW0B2JEiSnOTr 8smWL/9sQriqp+kVx+49Rq3fXtI9gEuZQ40kxY5BRRk6YBmuFaqZVqehEjZKtcXHnKBm f/GAs/vMZ4E57c1x+Yj3Js8VcLhyPHEeVbVb/KroWSXhopVWTsldlU/rwRIwUpsY2XTn tTOR9xV/Y7fd+9GoSXCAOuWTffLYgq+VJ4SJlzRMP1uJ7kAhCxd8DgPuZ4B8NZkJ7ouF uSYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc :content-transfer-encoding; bh=8EHythZyqcSYqnIyrsV3flqqgX5tPkZwghcXZdsresE=; b=GwduqxhygaUaj/NT01iIkCtba7YBvfgoO2djkDJ4XStDbZY0fD04wUey4LFytsWh7W CkRE+2K3rqiH7wEkEFyWtb+Avvb9utwIIMHj+F/21sCiqYtgQcmS6+0PVgv7IzFYqI7V 1dV8UwOEUR8O9bIR3zozLPDPzEI9Y8ymaEHikZZs/4JUX/6j2b23Daacgub464T6F4jf k3kYvkf1KlmY2Rh46TFoTfP0Okwozb1/vb/XX7pNmSAHpCMaPahqXkBlAjJESpIPq0kF q4dQ8sckwezOKJo8/oy3vim+5Hl7ZIVTnoeUTFSk1gyW1ZQHHx4YTLf5z1GQFpdWqDCH yV8g== X-Gm-Message-State: AOAM532kov27G+dBi11Z2Oh8l+m6GdrXHDBdNLNYy0p/kg78xal9BvtT 91liRW5A0LG2Yi2ZTO8r5s0cZanoqRbNSrN4PFzpX1xpsYHr0g== X-Google-Smtp-Source: ABdhPJwWCWMrRSHmWn+f5/dO5PzL0juga0VbKSl9AdPN/Vg9TtcQjz6H9A6FUvPMujZJq1S1OPACZ0cm/sFCpN0PEDE= X-Received: by 2002:a05:6602:2809:: with SMTP id d9mr15605427ioe.79.1597750840021; Tue, 18 Aug 2020 04:40:40 -0700 (PDT) MIME-Version: 1.0 From: =?utf-8?q?Marcin_=C5=9Alusarz?= Date: Tue, 18 Aug 2020 13:36:07 +0200 Message-ID: To: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 1/2] drm/i915/gt: obey "reset" module parameter X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 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" From: Marcin Ślusarz For some reason intel_gt_reset attempts to reset the GPU twice. On one code path (do_reset) "reset" parameter is obeyed, but is not on the other one (__intel_gt_set_wedged). Fix this. I noticed this because I stumbled on a bug which completely locks up a machine on reset (preventing me from saving the error state) and i915.reset=0 wasn't working as expected. Signed-off-by: Marcin Ślusarz --- drivers/gpu/drm/i915/gt/intel_reset.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c index 39070b514e65..f4823ca2d71f 100644 --- a/drivers/gpu/drm/i915/gt/intel_reset.c +++ b/drivers/gpu/drm/i915/gt/intel_reset.c @@ -816,7 +816,8 @@ static void __intel_gt_set_wedged(struct intel_gt *gt) awake = reset_prepare(gt); /* Even if the GPU reset fails, it should still stop the engines */ - if (!INTEL_INFO(gt->i915)->gpu_reset_clobbers_display) + if (!INTEL_INFO(gt->i915)->gpu_reset_clobbers_display && + i915_modparams.reset) __intel_gt_reset(gt, ALL_ENGINES); for_each_engine(engine, gt, id) From patchwork Tue Aug 18 11:37:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marcin_=C5=9Alusarz?= X-Patchwork-Id: 11720581 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1574C1392 for ; Tue, 18 Aug 2020 11:41:55 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E842920706 for ; Tue, 18 Aug 2020 11:41:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Cto9bZQ+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E842920706 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7BA9A89BA9; Tue, 18 Aug 2020 11:41:54 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-io1-xd44.google.com (mail-io1-xd44.google.com [IPv6:2607:f8b0:4864:20::d44]) by gabe.freedesktop.org (Postfix) with ESMTPS id 933C789BA9 for ; Tue, 18 Aug 2020 11:41:53 +0000 (UTC) Received: by mail-io1-xd44.google.com with SMTP id g14so20904039iom.0 for ; Tue, 18 Aug 2020 04:41:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=IQRzeTbJ3kFwAq9b45PC9yqOKqoAF/TD3Vt6/LQeMPg=; b=Cto9bZQ+UDGvAPr20OVBoX+as/RygU/jlijuGAoYJ+5eRYBnEbulsg7shE0KK5PwjD F+VbcOhwJnR5Fdxx2oM9WZ79XBD+rHFFQjtlXZ9so9SzwspMX4Sn51hRrMsyBDp7okZ/ s9J/gah6MHQVieYNw5LMxz1uBgW5xQYlWCt5vCGQn8JEsvXx4spmIhfGEmntBIbThUyA UTI+y85isjYc/iNaqzXQUd9Bhg69h59sxcGTzNSoJusHmfv71oLfhHjyuqb3smqbnIV0 S3FyqkKLu12QLZCG4a99E1/8mjQ3iJkoB7ZHAGcCPJndpvFYRAbqx/6SaRkcR+IfwlM+ Zdzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=IQRzeTbJ3kFwAq9b45PC9yqOKqoAF/TD3Vt6/LQeMPg=; b=LSIKJrG42Xvzt7YNs1c+/GnCFQv3dtBxsmJWXrKZ2CSanxIV01ulTq6TSXlPKbavX3 mZi3VZIWc2uIaOQqmSe5EpVZ9cWX9kjw6pF22+uc+KuaZsC0EH5Xm01AFmk0EiPUNgNQ BG9M1B+6QDq/Udx7HTJ4SozS4lID2ra70MIEwap6l3LtBuHIX+VW4CjesIQ/sDEwHr09 5tiZ2qVyWrDE2PYcUQ13RMPjd3E4ETYorcoYQeiFgQvGM3ODIeZhodtApSBFqfPrvr6I oebW1j6edZaoq/nGVp3A4ICGRJdOB8ft+jz/vS1H+bJ5FXiojOsUy7IcFaDS7Rj8kMzX Y5AA== X-Gm-Message-State: AOAM531tFgWNAPccEDLiP4RbhKkPFeVSsooT5VepwjaLvTsOsFuArg9k xufLDFBAJp3IE4G1C6j/ofQXdkH72snbJHF1xPXAsSorc10= X-Google-Smtp-Source: ABdhPJyx+957c09+bA6QGM06rb8IiQgGSvzE6r80hnpAEDYzN/NPFlmKCLXZg8X7f+FHPW+dpzuWuFEWkFa5tzrG0oA= X-Received: by 2002:a5d:954f:: with SMTP id a15mr16074760ios.53.1597750912814; Tue, 18 Aug 2020 04:41:52 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: =?utf-8?q?Marcin_=C5=9Alusarz?= Date: Tue, 18 Aug 2020 13:37:20 +0200 Message-ID: To: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 2/2] drm/i915/gt: raise logging level of "gpu reset disabled" message X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 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" From: Marcin Ślusarz Few lines above there's drm_notice saying that the gpu will be reset. Printing "gpu reset disabled" using lower logging level makes it harder to figure out what happened. Signed-off-by: Marcin Ślusarz --- drivers/gpu/drm/i915/gt/intel_reset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c index f4823ca2d71f..0384315c190d 100644 --- a/drivers/gpu/drm/i915/gt/intel_reset.c +++ b/drivers/gpu/drm/i915/gt/intel_reset.c @@ -1042,7 +1042,7 @@ void intel_gt_reset(struct intel_gt *gt, if (i915_modparams.reset) drm_err(>->i915->drm, "GPU reset not supported\n"); else - drm_dbg(>->i915->drm, "GPU reset disabled\n"); + drm_notice(>->i915->drm, "GPU reset disabled\n"); goto error; }