From patchwork Sat Nov 14 04:38:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Skeggs X-Patchwork-Id: 11905413 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=-13.3 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,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 A5372C5519F for ; Sat, 14 Nov 2020 04:39:11 +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 3C06C22268 for ; Sat, 14 Nov 2020 04:39:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="r/OIRbmF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3C06C22268 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 5459A6E8A2; Sat, 14 Nov 2020 04:39:10 +0000 (UTC) Received: from mail-yb1-xb33.google.com (mail-yb1-xb33.google.com [IPv6:2607:f8b0:4864:20::b33]) by gabe.freedesktop.org (Postfix) with ESMTPS id 700606E8A2 for ; Sat, 14 Nov 2020 04:39:08 +0000 (UTC) Received: by mail-yb1-xb33.google.com with SMTP id t33so10697608ybd.0 for ; Fri, 13 Nov 2020 20:39:08 -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=nAB5ZL8GZmo45TvNm8Pu4enelHiyGRANrlP8LRjXdkA=; b=r/OIRbmFHDgM0Ybuog0vbWTzOYObm9BfMcoKJ0mhHOFQDuI+Zn8xNY1MrwB1UIIncn MjDN42+4+90RbCr/McQhB7h7nlIobZ3siFXLA35FgLnfEzAtA0527p6vhxyxijACtiET gZDbGPi3FpAFDrksgkBaisnaNB8c/3p8E1n83vPFmaGqhEzPxkDQOIewbOg/+shQhrbe 9BxGz/gQnkyfclc4pj9snfCgKV/aVwTJQOxHQM6W+66auC7DKt3NjAxfW33COxS5pSdS JZYzmbp/TEtfiwFvPvcHTvb3fjv1s98BYYTivVN6RXLs+IJT3xhJgOONrfit4Nrx3mnE TSMg== 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=nAB5ZL8GZmo45TvNm8Pu4enelHiyGRANrlP8LRjXdkA=; b=l5ewidq3rDfWwxyT3lI3FlJu8PzXwDV2OXa8pfFIl7BywM/Vk+yHCYykydYUf4t7jm BI0Hxxx8aE54PhauTpKg10dw3cHngjsuBjFlcmHjy0ZEe0btS3B2NScAUtrRYeq8tk18 GKemE6/nwGUu40WckJqEsu+OeiPCbuIOn/13Bbw5dMt1+H16/q4HA715AIatVcdFHlPW CpJ0lcMBotfvqXMM1Szx6CTgxHTVWn7dW9nD0hilamNRizqpxflyqJL78/cWFD+hE0tg 3pWS/W61Qtih7EenyiXhO0OUGWDr+vUEuKx4A8erDYMXGg00Vd5fo+XHgXrtn3YYhts4 pJCg== X-Gm-Message-State: AOAM531K0So05NBtD+1ePA0LnaqVBmJQzGj4lwaLbzNalO4GfzUBAhEr bNWgctTAgUxAZtkMQoc/xkrfg94LA6EdeAvMSvrWJzXUGX8RYw== X-Google-Smtp-Source: ABdhPJzfByZKm6oo1tVevg+jq+z5k3zHMb6Y+ZQy+lzkZAO/7ffE5Y2fBtuAcV9rCICY48vNWhCQQx6RF4HySBJPEpg= X-Received: by 2002:a25:b11e:: with SMTP id g30mr7728326ybj.71.1605328747303; Fri, 13 Nov 2020 20:39:07 -0800 (PST) MIME-Version: 1.0 From: Ben Skeggs Date: Sat, 14 Nov 2020 14:38:56 +1000 Message-ID: Subject: [PULL] nouveau-next 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" Just a single fix at the moment. An alternate version of a regression fix in 5.10, against additional changes from drm-next. Ben. The following changes since commit 512bce50a41c528fa15c4c014293e7bebf018658: Merge v5.10-rc3 into drm-next (2020-11-10 14:36:36 +0100) are available in the Git repository at: git://github.com/skeggsb/linux linux-5.11 for you to fetch changes up to be323a4cef022aa9685b08d5a94ddc841ccf617a: drm/nouveau/ttm: avoid using nouveau_drm.ttm.type_vram prior to nv50 (2020-11-14 14:35:57 +1000) ---------------------------------------------------------------- Ben Skeggs (1): drm/nouveau/ttm: avoid using nouveau_drm.ttm.type_vram prior to nv50 drivers/gpu/drm/nouveau/nouveau_bo.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)