From patchwork Fri Jan 15 01:06:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Skeggs X-Patchwork-Id: 12021169 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6877FC433DB for ; Fri, 15 Jan 2021 01:07:05 +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 1A41023A9D for ; Fri, 15 Jan 2021 01:07:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1A41023A9D 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 357F36E140; Fri, 15 Jan 2021 01:07:04 +0000 (UTC) Received: from mail-yb1-xb36.google.com (mail-yb1-xb36.google.com [IPv6:2607:f8b0:4864:20::b36]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7F6546E140 for ; Fri, 15 Jan 2021 01:07:02 +0000 (UTC) Received: by mail-yb1-xb36.google.com with SMTP id k4so3569723ybp.6 for ; Thu, 14 Jan 2021 17:07:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=ptMG8h/t27FZ04Kp7gTFbJoVOkYkpr/EhrsbG2AgIbM=; b=AzOzgEXs9RbZ6SHFH5yRscm8btBA3c+bF96dTQAf5BCV9IPi5OY+8Rs6YP3JpX1APn zju2/DAQpfWZogB846RY/6guay5Wv6eFYuMafPylKhNbuQazOU9DgDWnV1eE0ag2ItaM tHy9JVxViPjL6oecW7jrYStdvhXo1I5g5pUyD8HCw0dXRNBleqmwJtSt2+7Mzv5kpL+6 /O98RjnEL4oFv31zbHqyT5lBhCsXAHKZ0UsdGEzWS8+aSH9ZDXx5sXkg9DK4OMCjpkC2 EkMnX0ymHmC+QnHuJvSzOSzsM0592naT0MATIYrJySo5XPOvlVgGCQuxhF371eNHUta0 1L6w== 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; bh=ptMG8h/t27FZ04Kp7gTFbJoVOkYkpr/EhrsbG2AgIbM=; b=CwQ65MN7Ru6dlClsTPaeIAFik+K4Ln26/wi/kCWcSGmIxV040actNJJc9XqAbu+Dle ArUmxe7jkgvgjsXI5peETE+VVsgQcQAfFQYIt5+IO6ICPVQ3sTp0OLvvkFOeRf7Fx+xD 3Qa0ma0sI1U5t0WOkbNAYExgONwiMUJBwytiCTC7O0oi0XzWsRqHg98qUOhLZWIU696T BwFyJHwq3eFWdYX37a8ccI3hXD3oXfhajWjIIse+jXTd7+nAgOGLnZX7v8MJcnBOeEEs Pk8Q3HVS9W4Eo4Fiz2IY/AbJW5G3bnXgfRYt494HHS3WvlEmwb/GHJblIHLyypdCQCuQ w/2g== X-Gm-Message-State: AOAM530POLYXR+TiJQvtw02Bgd5uxReF3wvav8Lu+jWk776h8Kt27M4h 7ZtIjinOYP2ZaPb1SuPTTBmD7ON4pQkFYrntou0jhNTKM+5NrQ== X-Google-Smtp-Source: ABdhPJzRcB8FYVP5ll1w6Dgwi8d/GN8xG2CjTABF2rnp4zReYwZM7PbTZMTD43/kYGhcSHdRULpgqD+rSbQS+5CG4t4= X-Received: by 2002:a25:b703:: with SMTP id t3mr16361227ybj.96.1610672821296; Thu, 14 Jan 2021 17:07:01 -0800 (PST) MIME-Version: 1.0 From: Ben Skeggs Date: Fri, 15 Jan 2021 11:06:50 +1000 Message-ID: Subject: [PULL] nouveau-fixes 5.11 To: ML dri-devel , Dave Airlie X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hey Dave, As requested, here's a tree with the non-Ampere-specific fixes split out, as most of them are potentially relevant to already-supported GPUs. I'll send another pull request with bare-bones GA102/GA104 support shortly. Ben. The following changes since commit 7c53f6b671f4aba70ff15e1b05148b10d58c2837: Linux 5.11-rc3 (2021-01-10 14:34:50 -0800) are available in the Git repository at: git://github.com/skeggsb/linux 04.00-ampere-lite-fixes for you to fetch changes up to caeb6ab899c3d36a74cda6e299c6e1c9c4e2a22e: drm/nouveau/kms/nv50-: fix case where notifier buffer is at offset 0 (2021-01-15 10:25:17 +1000) ---------------------------------------------------------------- Ben Skeggs (7): drm/nouveau/bios: fix issue shadowing expansion ROMs drm/nouveau/privring: ack interrupts the same way as RM drm/nouveau/i2c/gk110: split out from i2c/gk104 drm/nouveau/i2c/gk110-: disable hw-initiated dpcd reads drm/nouveau/i2c/gm200: increase width of aux semaphore owner fields drm/nouveau/mmu: fix vram heap sizing drm/nouveau/kms/nv50-: fix case where notifier buffer is at offset 0 drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 ++-- drivers/gpu/drm/nouveau/dispnv50/disp.h | 2 +- drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c | 2 +- drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h | 1 + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 12 +++++------ drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/i2c/Kbuild | 1 + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.h | 7 +++++++ drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c | 10 +++++++--- drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c | 17 ++++++++++------ drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gk110.c | 45 ++++++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gm200.c | 7 +++++++ drivers/gpu/drm/nouveau/nvkm/subdev/i2c/pad.h | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/i2c/priv.h | 4 ++++ drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gf100.c | 10 +++++++--- drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk104.c | 10 +++++++--- drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c | 6 +++--- 17 files changed, 112 insertions(+), 30 deletions(-) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gk110.c