Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp5821030pxb; Tue, 16 Feb 2021 08:22:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJyCVBTcbbnSUNZsz9tyNDEJih3gbaZzNd3XH+hZSVHbWmDTbn+RvIDKXiT6o/RzreIJZkkB X-Received: by 2002:a17:906:da0b:: with SMTP id fi11mr21505675ejb.392.1613492561024; Tue, 16 Feb 2021 08:22:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613492561; cv=none; d=google.com; s=arc-20160816; b=SCmv0J9ZcovO9USMJfmHUbozLsZyc/ivRHxJ9azPoRAJHN5449z8U5tJBn9cuA66n4 fINljX+qJaU8ZdoZ/Rt5l9TSanMh/4/hryYz7b4IDQ0Y0USq6gxAZ75CpId2YGg9AeAm idTQUUq5HL4u3v5F/C83rGOgl0RPRHu3StCG9M3B2pb43AwEUVqrhtYjsECgLVTSHXxR YyITZI6eamDxGHzUvYehga2KcW4XZXZzhziGeqbMvWBHcNK1a0KdzQAStGnqDtrBAaB+ 1969BtiWKkWFwtJVBLac26Ul9L6H9Y7hXT/PbYOsLPSngr3s9J+yF9cqgpI9NXp2mSTN Pjbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=0icCT5ApM7LeprOgl2f4wAWSG1VmMUQ3gNso94fT43o=; b=jmPziU/yJJdLFWWnjNhaig38j7HtRBA+O961YpBz0cypqnVfF5/tReryWApMV9gkZA nM7QlHzF99IeMHDgG7qwADupn6SR2ZyiSbC6Cv4G0morbvqcsHtBGlBSjhHIR/Fan8QC Yzkoev8MstiZ75jk8uO/g6XW3VPjtnWacLlYtu8xUXBLtPxwyfJxuMOwkwbytUdJ63EP 62vqjh5vMah5QdYB3JN66hmXfKYsAXwqOJg12T8dzj7WEjt3rHB04TgyCptSwX1Z4sT5 nImsav611Gwu+R01JQ0LVaX8hLI0gnHdDq6dtK4GSnkJRutpnOH/lozXBIqJyZuZabjz VTcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=mqWp9dSb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g1si13987648ejb.606.2021.02.16.08.22.17; Tue, 16 Feb 2021 08:22:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=mqWp9dSb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230378AbhBPQU6 (ORCPT + 99 others); Tue, 16 Feb 2021 11:20:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230204AbhBPQU4 (ORCPT ); Tue, 16 Feb 2021 11:20:56 -0500 Received: from mail-qt1-x82f.google.com (mail-qt1-x82f.google.com [IPv6:2607:f8b0:4864:20::82f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B0BAC061574 for ; Tue, 16 Feb 2021 08:20:16 -0800 (PST) Received: by mail-qt1-x82f.google.com with SMTP id c1so7449558qtc.1 for ; Tue, 16 Feb 2021 08:20:16 -0800 (PST) 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=0icCT5ApM7LeprOgl2f4wAWSG1VmMUQ3gNso94fT43o=; b=mqWp9dSbEn01YNx52E7+PStvmW8EtfqaziS2vz5FTEcwEa/RmONY3tRY5FPJc83+QS okRRzYlHTubrtbTDGjqCIJfFpqBcNnu54ZNprIOMeNenO2w2K3b4sqVNSZHFGLmve0Na lOOZkUo8OBB7vEdsor0mDx0w3g8fdGaT8QNhIr4YhaaB0nCMyUoMMRb8spSL6E8jgSYR 5tsUw88RF+BXGs7tqQSX247pHLs1NjbJ9BCZVVgWY8qvPWcBLme0xsHXtEmMqAyko7F3 ABw5m3QlyLsR6dK90mQ/LQy2W/vk+8ioZsPrANon7gowXiWGtB2a7fQZW8J8VFgy5q7L pXJw== 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=0icCT5ApM7LeprOgl2f4wAWSG1VmMUQ3gNso94fT43o=; b=Qiu30QUDX/1Y/DjKpMK2j4TMoWp3X+OC4DjQHTFdAs/rJmM4jxaVbNlFgxhVxqt6e3 DYrVOHZEWd8KD8jeqXd3P+75grTNrHJWGURchLLVHCuVgAx7WEPvfGMF1P2Mo7lDUK4m LNLy48iHnudBXm3E9nk6ZplZ3EW9y3ULggHdewoqUOiOHVzPw7y/rMJba463jBpja5EI lYe6BVi+j0F+Wm7ION3EoWqwMXoajSkk33yhxUEz8hFGGl3qKdHGSPA9uX1CxUo5ezKB /afWdfXSOj4lbd/H5U2nyMjTSq5QY0jJCgPDH9+uxGqNotDzEar8lJ6lt601lEdfwy6i 9aZQ== X-Gm-Message-State: AOAM532t+X9YL+WomavHc8kcBY/Vfupjp7IbEHMKts8LEXrHd4wJPTKE EK8WgJ4zX7/1NaNSSo3C8nexrsH5aBctpw== X-Received: by 2002:ac8:1c8a:: with SMTP id f10mr19237800qtl.4.1613492415041; Tue, 16 Feb 2021 08:20:15 -0800 (PST) Received: from localhost.localdomain ([187.39.20.240]) by smtp.gmail.com with ESMTPSA id d22sm13508855qtp.34.2021.02.16.08.20.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Feb 2021 08:20:14 -0800 (PST) From: Diego Viola To: bskeggs@redhat.com Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, nouveau@spliet.org, gnurou@gmail.com, Diego Viola Subject: [PATCH v2] drm/nouveau/pmu: fix timeout on GP108 Date: Tue, 16 Feb 2021 13:19:24 -0300 Message-Id: <20210216161924.1687-1-diego.viola@gmail.com> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This code times out on GP108, probably because the BIOS puts it into a bad state. Since we reset the PMU on driver load anyway, we are at no risk from missing a response from it since we are not waiting for one to begin with. Signed-off-by: Diego Viola --- drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c index a0fe607c9c07..5c802f2d00cb 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c @@ -102,12 +102,8 @@ nvkm_pmu_reset(struct nvkm_pmu *pmu) if (!pmu->func->enabled(pmu)) return 0; - /* Inhibit interrupts, and wait for idle. */ + /* Inhibit interrupts. */ nvkm_wr32(device, 0x10a014, 0x0000ffff); - nvkm_msec(device, 2000, - if (!nvkm_rd32(device, 0x10a04c)) - break; - ); /* Reset. */ if (pmu->func->reset) -- 2.30.1