From mboxrd@z Thu Jan 1 00:00:00 1970 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=-0.5 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no 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 8D506C433EF for ; Fri, 10 Sep 2021 06:21:08 +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 415CB61153 for ; Fri, 10 Sep 2021 06:21:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 415CB61153 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BCC936E976; Fri, 10 Sep 2021 06:21:07 +0000 (UTC) Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by gabe.freedesktop.org (Postfix) with ESMTPS id 381686E975; Fri, 10 Sep 2021 06:21:06 +0000 (UTC) Received: by mail-ej1-x629.google.com with SMTP id lc21so2025443ejc.7; Thu, 09 Sep 2021 23:21:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Rc47DAFBHht81L63lYlo/o42HpBggaS7zV+MLv8YHOU=; b=mt+XVROdEcBet94DgbIDqgXpvSW1V0vYNer0g/o2djYKlUVVgVR7XUd+28W8meqtYG 2d41LNkyOo7a9UMT+AJmsvjUdexV9OQZsqfDuvVjBta+rN+Iybo0ZGsVTvdt3BK6/Kc8 qv+xT9hy1ie23o+iywxrztHG3mNNQqEQ1jtA0haVm5Opm6XFB1oDLfGRCGWRbnf3uIc1 y67mFcTCqsBV2suY97RvRgrlOUO/0Vq+ePlB7oRzPcTeFEQgLYdrtvF1iozlmdsLKeH+ bDR9rdBsdyNSqGRYxdmZq6f6WliTxJCFvULutddEi9xncCQttwmd6Tg6Pd5JhRJkNUtu VWMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Rc47DAFBHht81L63lYlo/o42HpBggaS7zV+MLv8YHOU=; b=E+G4gnfd31OkHmGQXtlWaWlX6UG48o/5Mceo4Oqukss0KIIkSq96FKL3ApbZmyUwQB eHFuEAEr5AT32CnpLjLmugXVKgx5hYtFFkEIAk6q4Sb/HcVnC6qCoHs1+ciKhtJ2+A9S 2diViFRwjpzhvmz92mpVDaQOspa5DgKoJsth+BxQ4EtIiBUQB1Ctf+lhjNMw4loc+8z0 3fEHRglCSknCsWERccinj6d9Jk+Xcs+aCK/M/G5lC8e7tBH9YfnaI1Acy4qv9DmP2LjN O5rIhmDJ+D6r9eQ43AMq9f6S/XvR3xsrBWDGiHfaWA9iWluVk8JWWbKUqHxASJd03vH0 JLAg== X-Gm-Message-State: AOAM533meNEcMpH59R4cCts3d3t2rapdY1lSCOMagpSPUjLHU51I3Qf5 1NdjoiOoc7xlNwhh9W8CD9XyMcXl5A/5FSQzJyE= X-Google-Smtp-Source: ABdhPJyuRbn3A5Hb/G7cmLmBaHLa+KxE5+F2SfZrwQ5Y6q6scNv90JW7ppqNtPbGgTNw168BUXOI2PSR6696qpKvoQ8= X-Received: by 2002:a17:906:8608:: with SMTP id o8mr7391165ejx.470.1631254864545; Thu, 09 Sep 2021 23:21:04 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Dave Airlie Date: Fri, 10 Sep 2021 16:20:53 +1000 Message-ID: To: Daniel Vetter Cc: Thomas Zimmermann , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Sean Paul , Maarten Lankhorst , Maxime Ripard , dri-devel , Intel Graphics Development , "DRM maintainer tools announcements, discussion, and development" Content-Type: text/plain; charset="UTF-8" Subject: Re: [Intel-gfx] [PULL] drm-misc-fixes X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, 9 Sept 2021 at 19:30, Daniel Vetter wrote: > > On Thu, Sep 9, 2021 at 5:35 AM Dave Airlie wrote: > > > > On Thu, 9 Sept 2021 at 03:44, Thomas Zimmermann wrote: > > > > > > Hi Dave and Daniel, > > > > > > here's this week's PR for drm-misc-fixes. One patch is a potential deadlock > > > in TTM, the other enables an additional plane in kmb. I'm slightly unhappy > > > that the latter one ended up in -fixes as it's not a bugfix AFAICT. > > > > To avoid messy merge window, I'm not pulling this until after rc1 > > unless there is some major reason? > > Christian misplaced a ttm fix, so we really want this. Maybe > cherry-pick to drm-next and then drm-misc-fixes gets rebased instead. > > And yeah I dunno what do with our conflicts around merge window, maybe > we're letting trees diverge a bit too much. I've cherry-pick the ttm fix, the kmb fix should be somewhere else, I'm not going to pull it in from there. Maybe once rc1 gets out it can be rebased. Please nobody push to drm-misc-fixes until post rc1 + a day or two. Dave.