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=-3.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED 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 4A320C388F7 for ; Tue, 3 Nov 2020 22:20:19 +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 DC6A0223C6 for ; Tue, 3 Nov 2020 22:20:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=shutemov-name.20150623.gappssmtp.com header.i=@shutemov-name.20150623.gappssmtp.com header.b="K1bjUKfX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DC6A0223C6 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=shutemov.name 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 61E446E911; Tue, 3 Nov 2020 22:20:18 +0000 (UTC) Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by gabe.freedesktop.org (Postfix) with ESMTPS id 404616E910 for ; Tue, 3 Nov 2020 22:20:17 +0000 (UTC) Received: by mail-lf1-x132.google.com with SMTP id l28so24364909lfp.10 for ; Tue, 03 Nov 2020 14:20:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shutemov-name.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=QGOEhKsA2OwG13b5gtkFmoIkhKN0Tzb9Yz1d9AT63nE=; b=K1bjUKfX51b5qotZAiYNouvyUDtkH7cr0GZdA9qNvLxnxk0L95HdWtEl4yID/8o5ew T3cOoBhbIgYJiILZSN1Gkm6ujI/dJvD646mMVFkHQTe+FXEtf56MJl63OFZVE0HgAo+C THbItY64tC1LOig9tvos2ldGnH5k9hJgJyjTDn6okS2HvL5MnpeLV212jQcBuFLWpA7E vOBc9Ip7M5kKzR3yMVQ/AIGzLN0OYO96I5bqwTMcX3Rrt64kA2xf3/s70Hl8EPeZX4RW qKDjdLro3yz/JG3KXODfBo9EqPCkpwkWwZ1eAMjCDcrpY+J5h1ESvJjKNPMqEub0pwr8 Ho9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=QGOEhKsA2OwG13b5gtkFmoIkhKN0Tzb9Yz1d9AT63nE=; b=iWjDqn872rHVpUWUcy+/ArKDptK+Q2Q5fqobknrvtMbaP+VKzKLdHeRwaYIyNsI9Qt XRkawbMCiGkWCwr8FvdHijTrR1PpdIkt8JVPH2/nrg0z9Cq2bMGqAWaOuS2I4x5HbX+S ch822jYWQL14cwybDLi2DcRM7IwJamsAq6kdq0AhTr7jEBnjsjJyiYNAAOw7G2Yf29zv ooA+Ie/Z5EcAzuzCh6UkMiywipDswGEkIrvYXfMjPYqpK/+bnEzNLJSllpsAGhsxtg8w 1MpLo4gnH4qDxQwILPMcver6kSZPpuW9r7cwazsJ4xr/KSPTe2vi2t6x3jF7CnXXEkG0 S/Sw== X-Gm-Message-State: AOAM533X1zz/i1AQHP6EmcakpG5QKvxIe3P769py5Cc8lF0vjtQg9fqc Ga05LUKt3yfYLMPbD7RN6kSGJw== X-Google-Smtp-Source: ABdhPJxRFm8qsXfpAv3oTL3woMRlKjMmcXF45qhzM91T8QG4fQEQSZWh7OW4c9/IsFKaaVMgS6bfEg== X-Received: by 2002:ac2:59d1:: with SMTP id x17mr8553159lfn.142.1604442015603; Tue, 03 Nov 2020 14:20:15 -0800 (PST) Received: from box.localdomain ([86.57.175.117]) by smtp.gmail.com with ESMTPSA id q5sm3728627lfe.262.2020.11.03.14.20.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 14:20:15 -0800 (PST) Received: by box.localdomain (Postfix, from userid 1000) id E18A7101FC2; Wed, 4 Nov 2020 01:20:13 +0300 (+03) Date: Wed, 4 Nov 2020 01:20:13 +0300 From: "Kirill A. Shutemov" To: Dave Airlie , Lyude Paul Subject: Re: [git pull] drm next pull for 5.10-rc1 Message-ID: <20201103222013.hypmzlq7uuqufe76@box> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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: , Cc: Daniel Vetter , Linus Torvalds , LKML , dri-devel , Ben Skeggs Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Thu, Oct 15, 2020 at 11:33:08AM +1000, Dave Airlie wrote: > drm/nouveau/kms: Search for encoders' connectors properly This commit (09838c4efe9a) broke boot for me. These two hunks in particular: @ -2066,7 +2120,7 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state) outp->clr.mask, outp->set.mask); if (outp->clr.mask) { - help->disable(encoder); + help->atomic_disable(encoder, state); interlock[NV50_DISP_INTERLOCK_CORE] |= 1; if (outp->flush_disable) { nv50_disp_atomic_commit_wndw(state, interlock); @@ -2105,7 +2159,7 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state) outp->set.mask, outp->clr.mask); if (outp->set.mask) { - help->enable(encoder); + help->atomic_enable(encoder, state); interlock[NV50_DISP_INTERLOCK_CORE] = 1; } I hacked up patch to use help->disable/help->enable if atomic_ versions are NULL. It worked. In my setup I stepped onto nv50_msto_help->atomic_enable == NULL. But there are two more drm_encoder_helper_funcs in dispnv50/disp.c that don't have atomic_enable/disable set: nv50_dac_help, nv50_pior_help. -- Kirill A. Shutemov _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel 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=-3.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 2AF41C2D0A3 for ; Tue, 3 Nov 2020 22:20:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DC221223AC for ; Tue, 3 Nov 2020 22:20:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=shutemov-name.20150623.gappssmtp.com header.i=@shutemov-name.20150623.gappssmtp.com header.b="K1bjUKfX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729855AbgKCWUS (ORCPT ); Tue, 3 Nov 2020 17:20:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729466AbgKCWUR (ORCPT ); Tue, 3 Nov 2020 17:20:17 -0500 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3DA5DC0613D1 for ; Tue, 3 Nov 2020 14:20:17 -0800 (PST) Received: by mail-lf1-x12d.google.com with SMTP id e27so1545788lfn.7 for ; Tue, 03 Nov 2020 14:20:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shutemov-name.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=QGOEhKsA2OwG13b5gtkFmoIkhKN0Tzb9Yz1d9AT63nE=; b=K1bjUKfX51b5qotZAiYNouvyUDtkH7cr0GZdA9qNvLxnxk0L95HdWtEl4yID/8o5ew T3cOoBhbIgYJiILZSN1Gkm6ujI/dJvD646mMVFkHQTe+FXEtf56MJl63OFZVE0HgAo+C THbItY64tC1LOig9tvos2ldGnH5k9hJgJyjTDn6okS2HvL5MnpeLV212jQcBuFLWpA7E vOBc9Ip7M5kKzR3yMVQ/AIGzLN0OYO96I5bqwTMcX3Rrt64kA2xf3/s70Hl8EPeZX4RW qKDjdLro3yz/JG3KXODfBo9EqPCkpwkWwZ1eAMjCDcrpY+J5h1ESvJjKNPMqEub0pwr8 Ho9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=QGOEhKsA2OwG13b5gtkFmoIkhKN0Tzb9Yz1d9AT63nE=; b=M1X4UOSX9HjsWt6K+gaB4Bxm2WKsP0cny81UzqIMaGS25c4GwA7gOyyMGvIEPiX3ce d2Ipw81PketXOfP5kIAFECY9+PRO7kV0h4g0k72tnJB2akc9J2NxhjwHgsybsc67/uqx djd0EKrUAtKQZnFyrgtB8+3/cqM633ZmrlafULe9W/WwwmvQKpwb8rDH20kZhf0ThMSz PeQeQhNz5suWcmsSUXtbmtfRZItJRlwdKpOsPTbmx5qd7ATNNGvzVJyi5hX/Ep9KylQD dnqz2Lk7cdXsH8WEXiFAf/nh2ONvtTtZzK3iO4MRXOrUPbsqxwLk6xfvBCyOOxiRJ0Ha tk9g== X-Gm-Message-State: AOAM532cMP5D9T7SP4aZI27k9nI2htGuEoLJ8+CyMVDfO7qOhIIGgOci AJOtTXEXSa3gDlhIjnKboUNOHg== X-Google-Smtp-Source: ABdhPJxRFm8qsXfpAv3oTL3woMRlKjMmcXF45qhzM91T8QG4fQEQSZWh7OW4c9/IsFKaaVMgS6bfEg== X-Received: by 2002:ac2:59d1:: with SMTP id x17mr8553159lfn.142.1604442015603; Tue, 03 Nov 2020 14:20:15 -0800 (PST) Received: from box.localdomain ([86.57.175.117]) by smtp.gmail.com with ESMTPSA id q5sm3728627lfe.262.2020.11.03.14.20.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 14:20:15 -0800 (PST) Received: by box.localdomain (Postfix, from userid 1000) id E18A7101FC2; Wed, 4 Nov 2020 01:20:13 +0300 (+03) Date: Wed, 4 Nov 2020 01:20:13 +0300 From: "Kirill A. Shutemov" To: Dave Airlie , Lyude Paul Cc: Linus Torvalds , Daniel Vetter , dri-devel , LKML , Ben Skeggs Subject: Re: [git pull] drm next pull for 5.10-rc1 Message-ID: <20201103222013.hypmzlq7uuqufe76@box> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Oct 15, 2020 at 11:33:08AM +1000, Dave Airlie wrote: > drm/nouveau/kms: Search for encoders' connectors properly This commit (09838c4efe9a) broke boot for me. These two hunks in particular: @ -2066,7 +2120,7 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state) outp->clr.mask, outp->set.mask); if (outp->clr.mask) { - help->disable(encoder); + help->atomic_disable(encoder, state); interlock[NV50_DISP_INTERLOCK_CORE] |= 1; if (outp->flush_disable) { nv50_disp_atomic_commit_wndw(state, interlock); @@ -2105,7 +2159,7 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state) outp->set.mask, outp->clr.mask); if (outp->set.mask) { - help->enable(encoder); + help->atomic_enable(encoder, state); interlock[NV50_DISP_INTERLOCK_CORE] = 1; } I hacked up patch to use help->disable/help->enable if atomic_ versions are NULL. It worked. In my setup I stepped onto nv50_msto_help->atomic_enable == NULL. But there are two more drm_encoder_helper_funcs in dispnv50/disp.c that don't have atomic_enable/disable set: nv50_dac_help, nv50_pior_help. -- Kirill A. Shutemov