From patchwork Mon Sep 16 14:36:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 11147163 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 A742A76 for ; Mon, 16 Sep 2019 14:36:13 +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 8F15E2067D for ; Mon, 16 Sep 2019 14:36:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8F15E2067D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CFCD16E9A2; Mon, 16 Sep 2019 14:36:11 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by gabe.freedesktop.org (Postfix) with ESMTPS id 097426E99F; Mon, 16 Sep 2019 14:36:10 +0000 (UTC) Received: by mail-ed1-x542.google.com with SMTP id a23so278265edv.5; Mon, 16 Sep 2019 07:36:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1XsV7RL+tXiXcHs/nNSnKdJfDWDCeCRmVKpz9qqh7x8=; b=FSagH7oEV8ZSpw0A2w+HazHyxoFisN+REAaCnx0kYNLpr/3F4IJOoK7BhwavqTLCuY DTmcDPzJokFUkKIZh5Ylpn7Cz5gmwrcyfM0ftrZy6zEe3Ui8PKFnRBYWjRxvHMKOFu4U lDsJe0kjNbZdAPcvYcJGHDOO9IosX0Pyi97ISd0Y5tQil++6vxOjvIta1P/g7k/crsVN rrD1R0DrSNgn2joeSnKzh+ZUYhE+vyI5BD5nVuNGlpAc2MdSS02TrDKQrzx+iKrUgyjJ ibLIq2wubunapCEjLI5gSZTewv6sBSPE79k1OpbGnrx4wa4/RZ7qfm0BxHOm/Y3sExs4 Q9gw== X-Gm-Message-State: APjAAAWAIMGyPDNrTsosobWiCg+WxNErhQJO8mowacA1pyQjjLrKL515 hEQxWpGcZ0ptP7lX8ykNdfs= X-Google-Smtp-Source: APXvYqxXBbdV8qdmbObyOkvwZ40s/zXM1aQGDXKm1JO7i3ZvwOtGICLnyv2wexFTsar9KsCikZrPbg== X-Received: by 2002:a50:f789:: with SMTP id h9mr62690414edn.139.1568644568525; Mon, 16 Sep 2019 07:36:08 -0700 (PDT) Received: from localhost (p2E5BE2CE.dip0.t-ipconnect.de. [46.91.226.206]) by smtp.gmail.com with ESMTPSA id v8sm2106478edl.74.2019.09.16.07.36.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Sep 2019 07:36:07 -0700 (PDT) From: Thierry Reding To: Ben Skeggs Subject: [PATCH 0/2] drm/nouveau: Two more fixes Date: Mon, 16 Sep 2019 16:36:04 +0200 Message-Id: <20190916143606.9272-1-thierry.reding@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1XsV7RL+tXiXcHs/nNSnKdJfDWDCeCRmVKpz9qqh7x8=; b=VmEY6TkoD9EByQhHCWP3BviHoRObQo0EZmi3oqyyjrcr1R55kNSIugaCQcdCTNx7XX bzImoc/VtY2zoTa8pDfrPhwC72t2gmcQTZdZuJBrXIYwYDPj3wcaiC3rAon/Oya8Zv/E KbCWVfiz5MXdDORppZuvDUrLyyQu/FNrRXwyqzuFm2BHpa1bskBCoiLRR4+aQ5hAwKL/ E1GKnXhEoQExbZTwEVbQZwxpJ5NlxrlgHi5tEg2PVILMEdCd7L+wO3Nyd/r43K72MSKp evteyuxrV8BpODA+g/Z+dhFaaExl85+3JAWuWhEQdW8kmItaUYsbu8G03kykZ6YigDTF hnpA== 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: , Cc: nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Karol Herbst Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Thierry Reding Hi Ben, I messed up the ordering of patches in my tree a bit, so these two fixes got separated from the others. I don't consider these particularily urgent because the crash that the first one fixes only happens on gp10b which we don't enable by default yet and the second patch fixes a crash that only happens on module unload (or driver unbind, more accurately), which isn't a terribly common thing to do. I'll be sending out fixes shortly to make the GP10B work more properly on a wider range of Jetson TX2 devices and enable it by default. One thing to mention is that I'm not exactly sure if the first patch is the right thing to do. I haven't seen any issues after that change, but I'm also not exactly sure I understand what BAR2 is used for, so I don't know if I would've even covered those code paths (other than the one causing the crash at probe time) in my tests. It'd be great to get Lyude's feedback on the second patch, since that call to pci_disable_device() was rather oddly placed and I'm not sure if that was essential for things to work or whether the slightly different point in time where it's called after this patch is also okay. It looks to me like it should work fine, but I don't currently have a way to test this on desktop GPUs. Thierry Thierry Reding (2): drm/nouveau: tegra: Fix NULL pointer dereference drm/nouveau: tegra: Do not try to disable PCI device drivers/gpu/drm/nouveau/nouveau_drm.c | 3 +- .../drm/nouveau/nvkm/subdev/instmem/gk20a.c | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-)