Received: by 2002:ac0:e350:0:0:0:0:0 with SMTP id g16csp95561imn; Wed, 3 Aug 2022 21:23:22 -0700 (PDT) X-Google-Smtp-Source: AA6agR5+hC0PgmAMTMD2UAddFW75pC0J7jef4aHXQtxnacl0RHg/+LPOZmUZQx+3GrQVYUoebm5/ X-Received: by 2002:a17:902:db06:b0:16f:16b7:69d0 with SMTP id m6-20020a170902db0600b0016f16b769d0mr104476plx.145.1659587002111; Wed, 03 Aug 2022 21:23:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659587002; cv=none; d=google.com; s=arc-20160816; b=wKUbw8Crr5ABtvkNx/cDdGvqoV9YB+/e49HI3Bms/s0EYKni95j82PTqEiXuLSA9A1 F66ag2G0aEaG6g1116EV5BcLVzLsKaMRXNq0Bm4p/H13j4ADOSIAEvkk6j6JZ117K5P9 MgBDu6hvK0+21vl91Uq/qZZRjkGl4A87ANZ8MvNW7KKMy+1C9TwrpVbwGip8iogfHt/O quSrKsMEdQvVZ07lRKbxE0+ad2IGrsQiDK5+utkqwdbL9DjhjUoDkGkXpxTG1inWsM7U NX1tQuRrF0AO3P7LC+Qadz/YGgRQqZSeJ6p87uijDbxU40AXwerrJ9hy5RmPHlHB/zbi Newg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=LVd6x4jd0g7TYMdesIbqiqpXq1pUyWFD95vFNyBmMLc=; b=VEOFZcGMqTOBGgx7HykaPjdGa52Jo5q1ipUbjWwJwSUrza1xV5hCBfkmo6jaEoATFt 0jzO209pFEsmodb4TMmkJWFXiqHp6wzUgLiKq3ofHLUQyIf6oIyCBA1r9/7Xj62YKZxw 9tlBuoMfuSJKhKHRkFi7GFn4IJzVqyzyn75w/tJtYNJ0UTHqor4Y+46En7U9uL4O7ocY asCafRGMDeAu/hmBxqmNRkhxVThDKnt5H3Obl4ta89Y2sTBdxO4+ngK07T76C3/w8CZk fRYGCmirV8EwNSQo2G0i/cshDb2x/8GolrmL8Ard45tRC7BKTpRVApx6U1iAbikeBeyJ gfAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=FkkSlScG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y31-20020a63495f000000b00412b6dd0cd0si41477pgk.603.2022.08.03.21.23.07; Wed, 03 Aug 2022 21:23:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=FkkSlScG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S237036AbiHDDhw (ORCPT + 99 others); Wed, 3 Aug 2022 23:37:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231368AbiHDDhv (ORCPT ); Wed, 3 Aug 2022 23:37:51 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2844F12D2E for ; Wed, 3 Aug 2022 20:37:50 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id dc19so11938302ejb.12 for ; Wed, 03 Aug 2022 20:37:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=LVd6x4jd0g7TYMdesIbqiqpXq1pUyWFD95vFNyBmMLc=; b=FkkSlScGm6mmeoBPA6MeYQvLc1RnIXfWRfW6UA/pN/ey69EO4VPSsor2KcBvVz0+Dn 1Rk4TnfLz0rgPESu3F9VyKL2aPXEWVzFNX0LyBh3y0LEfvGdAxUy+59k2eOeHcNeKTPf veXtqJ8V5phXmzyywQ1UJS85hO4i4fYjAX1NSMjYrhLC4YFjRpj/j7e1TTjIoK/YppbE eMhMBIsn/Y8GmVMomR0RSzM6Lg/C2vThcpU04rgz/wFoYLmzulfETi6l6uUwu21ij3wl wP7hyx/EgJA6qE3q9I9IflSw+gWwRpjltOkJW4q2RNR7iClEFzdTtrpNvV/Oc0ehRaVG iMTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=LVd6x4jd0g7TYMdesIbqiqpXq1pUyWFD95vFNyBmMLc=; b=OBRdVVXv2sKVsO5Okw8OdTLTiy/5kd45l/eCGOinCf8xkTlg708xEh1iMuK+SOpG4U X9MDx6mUjUoEkbLRZLBVdJXY8/ixvKU2GeNcxWNj29/KAsxNoLbKtDdt6AF9EJlxA1QK nHg+K3XvO1OmbfDIu0xwIAD9oMYR2TdpaxwvRlKAwn7HyVabC5ybiWmcMQ5Uh4AqkWH1 lxRPkjuRLW6w2hK/Nc3Xes6osiYwxluEzuU6TxNR8Vq82XNczUq4YrzFQUSOrOWryTcc CMOOHJjxLkc27sjC/uMIOA7eGpxoResjIhTqg/s1q8JWqQvE/eagPjuK8/55E5CFTPVM M/OA== X-Gm-Message-State: AJIora/61Uzyly+ft4VGqWWqR/4Y5ZLlFCOvAIGHiE5h/jKsfEExtOOp sgE2O80wd6jCOA1P5cYjb8RQdRaRIV5SFCYH3CY= X-Received: by 2002:a17:907:96ac:b0:72f:1dea:5b66 with SMTP id hd44-20020a17090796ac00b0072f1dea5b66mr22316171ejc.266.1659584268602; Wed, 03 Aug 2022 20:37:48 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Dave Airlie Date: Thu, 4 Aug 2022 13:37:37 +1000 Message-ID: Subject: Re: [git pull] drm for 5.20/6.0 To: Linus Torvalds Cc: Daniel Vetter , dri-devel , LKML Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 4 Aug 2022 at 13:16, Linus Torvalds wrote: > > On Wed, Aug 3, 2022 at 7:46 PM Linus Torvalds > wrote: > > > > I think I have it resolved, am still doing a full build test, and will > > then compare against what your suggested merge is. > > Hmm. > > I end up with *almost* the same thing. > > Except I ended up with a > > select DRM_BUDDY > > for the DRM_AMDGPU config entry, and you don't have that. > > I *think* my version is correct, in that clearly the amdgpu driver now > uses that buddy logic (just doing a random "grep drm_buddy_block" to > see). Actually I did miss that so that looks good. > > But this was messy enough to resolve that I think people should > double-check my end, and maybe I just got confused at some point in > the process. > > And while I seem to have gotten the same result as you did on the i915 > firmware side too, again, I'd like people to re-verify. I'll pull it down and look over it. Dave.