From patchwork Sat Jun 7 19:39:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilia Mirkin X-Patchwork-Id: 4315941 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 58EABBEEAA for ; Sat, 7 Jun 2014 19:40:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 44FF820219 for ; Sat, 7 Jun 2014 19:40:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4613C201F4 for ; Sat, 7 Jun 2014 19:40:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 46CB06E4F8; Sat, 7 Jun 2014 12:40:18 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qa0-f41.google.com (mail-qa0-f41.google.com [209.85.216.41]) by gabe.freedesktop.org (Postfix) with ESMTP id 28A6F6E04E; Sat, 7 Jun 2014 12:40:16 -0700 (PDT) Received: by mail-qa0-f41.google.com with SMTP id dc16so6234908qab.0 for ; Sat, 07 Jun 2014 12:40:15 -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=JnbgppPNwZ0BZZiycc/4Z840VZC96331+HGkPWGPiKs=; b=PTM8UvsU0S+pH4ZOenMqd2bL8fNaO/vgQU1eQW1//AOdSMu/B8PSSJcG7bOnxoaW4h VUYDg6G5P0x+vOXjZWG8gF8xyxS9UwbmwDR+a7CRovD8TSmFGFTUTcS/VmI8PbTZDzzj JEL62pmVwGopdwu55BJNx3nsUobY0U7CbAEbJibhkFYJXPSgT8d4/AbfelLXYDHdsBHN BdhyeeXLGe76yRc3TCF2MYQBZq74Aw6ZppoEpyLlNVir24W9Iojf1hjdYOgPuFqFNpr9 Auj8fa/Oay8k0KewKMxrFbDvGCMWul3HSwM3Ehd7QvkmNFPDd/J0j+ol2oUjXMFVExu5 hbIw== X-Received: by 10.140.93.132 with SMTP id d4mr19632917qge.1.1402170015245; Sat, 07 Jun 2014 12:40:15 -0700 (PDT) Received: from localhost.localdomain (cpe-74-71-2-122.nyc.res.rr.com. [74.71.2.122]) by mx.google.com with ESMTPSA id i9sm21565529qaq.14.2014.06.07.12.40.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Jun 2014 12:40:14 -0700 (PDT) From: Ilia Mirkin To: Ben Skeggs , nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/gk208/gr: add missing registers to grctx init Date: Sat, 7 Jun 2014 15:39:45 -0400 Message-Id: <1402169985-32242-1-git-send-email-imirkin@alum.mit.edu> X-Mailer: git-send-email 1.8.5.5 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 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-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This fixes hangs on GK208 which happen instantaneously on trying to use a geometry shader. Signed-off-by: Ilia Mirkin Cc: stable@vger.kernel.org # v3.14+ --- ctxnvf0 also writes to these registers (although slightly diff values), so I think this is right. So I guess trap 4 is whatever this 406 subengine is... drivers/gpu/drm/nouveau/core/engine/graph/ctxnv108.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnv108.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnv108.c index 48351b4..8de4a42 100644 --- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnv108.c +++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnv108.c @@ -545,10 +545,12 @@ nv108_grctx_generate_mods(struct nvc0_graph_priv *priv, struct nvc0_grctx *info) mmio_list(0x408010, 0x80000000, 0, 0); mmio_list(0x419004, 0x00000000, 8, 1); mmio_list(0x419008, 0x00000000, 0, 0); + mmio_list(0x4064cc, 0x80000000, 0, 0); mmio_list(0x408004, 0x00000000, 8, 0); mmio_list(0x408008, 0x80000030, 0, 0); mmio_list(0x418808, 0x00000000, 8, 0); mmio_list(0x41880c, 0x80000030, 0, 0); + mmio_list(0x4064c8, 0x00c20200, 0, 0); mmio_list(0x418810, 0x80000000, 12, 2); mmio_list(0x419848, 0x10000000, 12, 2);