From patchwork Fri Dec 14 03:44:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilia Mirkin X-Patchwork-Id: 10730459 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2C397112E for ; Fri, 14 Dec 2018 03:44:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 19E392CFFE for ; Fri, 14 Dec 2018 03:44:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C41D2D000; Fri, 14 Dec 2018 03:44:27 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED 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 6AAA72D001 for ; Fri, 14 Dec 2018 03:44:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1ED396EFC8; Fri, 14 Dec 2018 03:44:24 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt1-x842.google.com (mail-qt1-x842.google.com [IPv6:2607:f8b0:4864:20::842]) by gabe.freedesktop.org (Postfix) with ESMTPS id EF7ED6EFC5; Fri, 14 Dec 2018 03:44:22 +0000 (UTC) Received: by mail-qt1-x842.google.com with SMTP id n21so4808815qtl.6; Thu, 13 Dec 2018 19:44:22 -0800 (PST) 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=NgQhwNiSVysJrNHhGyAz/HkUMxkaw4HkTOdP3thTY+Y=; b=SE1JNKvmUrgWoi1TBvsa+//nnsH4CEH+VyLFjRtmAtd/ySKKItfqUcsdgcxNCzHXBN DtYkDilGxz6DrVacc73pRdVTT/7YNK80eHq5UtVR9tL7KzfxmUwYgApw6jIGQIFRp7qn wB206YlQ3jfFCO7iaW/J+0mA86I4cxoY9PDuGnT18namTO7Oj7x+kRfSZhUwWfvr9G/q vSRk6bOHtlaIkLflcZ6hHIGiO1pp2970obxvCbWQJjDS4cpv+K3gNYTvrJNpmgPGsqcd sxQgZPKhi9tHCl47AxiEHnj/655ARY9UNMNPCuos4qo8jlQ0awv0/uyXYhc5BGbGqrA7 hUGw== X-Gm-Message-State: AA+aEWYREPN/PyVE5wlf/72YcFPQB7Fw16CaWN+OQwAFAdKtpA9jeleQ bU1F7bApWjcrOx8ZUZrvN2+qBKKC X-Google-Smtp-Source: AFSGD/XFu0NRuL0I0znax1FUDCGHelFqDTm26189BiwWx9UMydikcqOgdj4d6arzILDxTsQE6tGrSw== X-Received: by 2002:aed:2185:: with SMTP id l5mr1308797qtc.276.1544759061983; Thu, 13 Dec 2018 19:44:21 -0800 (PST) Received: from athos.fios-router.home (pool-173-68-20-215.nycmny.fios.verizon.net. [173.68.20.215]) by smtp.gmail.com with ESMTPSA id a185sm2174947qkb.1.2018.12.13.19.44.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Dec 2018 19:44:21 -0800 (PST) From: Ilia Mirkin To: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, bskeggs@redhat.com Subject: [PATCH] drm/nouveau/falcon: avoid touching registers if engine is off Date: Thu, 13 Dec 2018 22:44:08 -0500 Message-Id: <20181214034409.30410-1-imirkin@alum.mit.edu> X-Mailer: git-send-email 2.18.1 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108980 Signed-off-by: Ilia Mirkin --- drivers/gpu/drm/nouveau/nvkm/engine/falcon.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c b/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c index 816ccaedfc73..8675613e142b 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c @@ -22,6 +22,7 @@ #include #include +#include #include #include @@ -107,8 +108,10 @@ nvkm_falcon_fini(struct nvkm_engine *engine, bool suspend) } } - nvkm_mask(device, base + 0x048, 0x00000003, 0x00000000); - nvkm_wr32(device, base + 0x014, 0xffffffff); + if (nvkm_mc_enabled(device, engine->subdev.index)) { + nvkm_mask(device, base + 0x048, 0x00000003, 0x00000000); + nvkm_wr32(device, base + 0x014, 0xffffffff); + } return 0; }