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=-9.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 106A7C433E6 for ; Mon, 31 Aug 2020 04:26:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DB6DD20782 for ; Mon, 31 Aug 2020 04:26:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IC5nDs49" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726072AbgHaE0f (ORCPT ); Mon, 31 Aug 2020 00:26:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725446AbgHaE0c (ORCPT ); Mon, 31 Aug 2020 00:26:32 -0400 Received: from mail-yb1-xb44.google.com (mail-yb1-xb44.google.com [IPv6:2607:f8b0:4864:20::b44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7302BC061573; Sun, 30 Aug 2020 21:26:32 -0700 (PDT) Received: by mail-yb1-xb44.google.com with SMTP id 145so2150241ybd.0; Sun, 30 Aug 2020 21:26:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=PX06aBk627NQ1JeMegFd6B64tEFsLtmyNkqRlailfm0=; b=IC5nDs49gJJNp2v81GvqILFp/15eYtDl2QXUOSAriKrk+Im/ZtF0wapcjFhYD1Aee2 jvbpHrmUBKZXPH50RHisaYAu6eL3nQMi8tqIbaQ0/GVrplidaSlxi0XkF9MZl9ZISJUy 4R6NeoUFpvYWgz/AVuuJruEx6FpoghNJLz+43yhjUyTFi+RgQA0FMEjf7VmO0Gn4rpOp K/qD0gy4DvulktUJNfw234A3UgA/n0f5FM+/q+PywIVycMRHERMlSkWhhpulpNbrvxve NZ2SJEQXzdPfvLg/ZZLsNRwFLSf7nvcbLvCRacQlOO83T58wRYi8uvtv/ICk4aX+fulv i55g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=PX06aBk627NQ1JeMegFd6B64tEFsLtmyNkqRlailfm0=; b=jrTbdNG/7rPlno8AW8yHDtug7LCwv+y6m0FR9rcFGDwrXwHklOeQN0CkteKwgbxVpY MqlfmaCSCGNeKwnrndVM4aYVvUHMvxr4EGc9sHAXfTy2tzVVmgnmU894N/8ikwCI+KZ0 UDNBs7aPQSQQKtIZO1srBZUuo5UoxL4k7BSjw8CE1VXp9FvHr1GBkRvv4S1Am9Fi9AUz sgiFnEn8hY/qqLsfKHTaNVCgzlvr2PRu8gaEqbnudzlsAQEbbkHCHkGy8BwgJKBQPrfO oATnsqPFLlfYptl9zFPiaGYMa3fOvs6kBY3bzhN52Cu/kh+Kp+5KR3TS3oawJFDw/ZnS gtLw== X-Gm-Message-State: AOAM532faJvNngQjAgMzCQhdAOXU0WIiYn3Ono+mPf+CJ7gfVE/lJwe3 JzU2vGf0Jl9izXD6A/kpsrAz9iSUU5rQkyr9xQ6LcCw1G+M= X-Google-Smtp-Source: ABdhPJy+0rEbq+GkNgtCw3GXB22ZHNHLhDwqJ7psgye+ciyrN8LcA9ntQoXdSFcOYdxLiOIsyTwz2cd2MlTJH1iqhGY= X-Received: by 2002:a25:c4c5:: with SMTP id u188mr16615125ybf.162.1598847990436; Sun, 30 Aug 2020 21:26:30 -0700 (PDT) MIME-Version: 1.0 References: <20200824183253.826343-1-lyude@redhat.com> <20200824183253.826343-2-lyude@redhat.com> <76392bff28359a88fbdf0857f011e0ed9f666dc4.camel@redhat.com> In-Reply-To: <76392bff28359a88fbdf0857f011e0ed9f666dc4.camel@redhat.com> From: Ben Skeggs Date: Mon, 31 Aug 2020 14:26:19 +1000 Message-ID: Subject: Re: [Nouveau] [PATCH 1/2] drm/nouveau/kms/nv50-: Program notifier offset before requesting disp caps To: Lyude Paul Cc: ML nouveau , Sasha Levin , David Airlie , open list , "open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS" , Ben Skeggs , Daniel Vetter , stable@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 26 Aug 2020 at 02:52, Lyude Paul wrote: > > On Tue, 2020-08-25 at 08:28 +1000, Ben Skeggs wrote: > > On Tue, 25 Aug 2020 at 04:33, Lyude Paul wrote: > > > Not entirely sure why this never came up when I originally tested this > > > (maybe some BIOSes already have this setup?) but the ->caps_init vfunc > > > appears to cause the display engine to throw an exception on driver > > > init, at least on my ThinkPad P72: > > > > > > nouveau 0000:01:00.0: disp: chid 0 mthd 008c data 00000000 0000508c 0000102b > > > > > > This is magic nvidia speak for "You need to have the DMA notifier offset > > > programmed before you can call NV507D_GET_CAPABILITIES." So, let's fix > > > this by doing that, and also perform an update afterwards to prevent > > > racing with the GPU when reading capabilities. > > > > > > Changes since v1: > > > * Don't just program the DMA notifier offset, make sure to actually > > > perform an update > > I'm not sure there's a need to send an Update() method here, I believe > > GetCapabilities() is an action method on its own right? > > > > I'm not entirely sure about this part tbh. I do know that we need to call > GetCapabilities() _after_ the DMA notifier offset is programmed. But, my > assumption was that if GetCapabilities() requires a DMA notifier offset to store > its results in, we'd probably want to fire an update or something to make sure > that we're not reading before it finishes writing capabilities? We definitely want to *wait* on GetCapabilities() finishing, I believe it should also update the notifier the same (or similar) way Update() does. But I don't think we want to send an Update() here, it'll actually trigger a modeset (which, on earlier HW, will tear down the boot mode. Not sure about current HW, it might preserve state), and we may not want that to happen there. Ben. > > > Ben. > > > > > Signed-off-by: Lyude Paul > > > Fixes: 4a2cb4181b07 ("drm/nouveau/kms/nv50-: Probe SOR and PIOR caps for DP > > > interlacing support") > > > Cc: # v5.8+ > > > --- > > > drivers/gpu/drm/nouveau/dispnv50/core507d.c | 25 ++++++++++++++++----- > > > 1 file changed, 19 insertions(+), 6 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/nouveau/dispnv50/core507d.c > > > b/drivers/gpu/drm/nouveau/dispnv50/core507d.c > > > index e341f572c2696..5e86feec3b720 100644 > > > --- a/drivers/gpu/drm/nouveau/dispnv50/core507d.c > > > +++ b/drivers/gpu/drm/nouveau/dispnv50/core507d.c > > > @@ -65,13 +65,26 @@ core507d_ntfy_init(struct nouveau_bo *bo, u32 offset) > > > int > > > core507d_caps_init(struct nouveau_drm *drm, struct nv50_disp *disp) > > > { > > > - u32 *push = evo_wait(&disp->core->chan, 2); > > > + struct nv50_core *core = disp->core; > > > + u32 interlock[NV50_DISP_INTERLOCK__SIZE] = {0}; > > > + u32 *push; > > > > > > - if (push) { > > > - evo_mthd(push, 0x008c, 1); > > > - evo_data(push, 0x0); > > > - evo_kick(push, &disp->core->chan); > > > - } > > > + core->func->ntfy_init(disp->sync, NV50_DISP_CORE_NTFY); > > > + > > > + push = evo_wait(&core->chan, 4); > > > + if (!push) > > > + return 0; > > > + > > > + evo_mthd(push, 0x0084, 1); > > > + evo_data(push, 0x80000000 | NV50_DISP_CORE_NTFY); > > > + evo_mthd(push, 0x008c, 1); > > > + evo_data(push, 0x0); > > > + evo_kick(push, &core->chan); > > > + > > > + core->func->update(core, interlock, false); > > > + if (core->func->ntfy_wait_done(disp->sync, NV50_DISP_CORE_NTFY, > > > + core->chan.base.device)) > > > + NV_ERROR(drm, "core notifier timeout\n"); > > > > > > return 0; > > > } > > > -- > > > 2.26.2 > > > > > > _______________________________________________ > > > Nouveau mailing list > > > Nouveau@lists.freedesktop.org > > > https://lists.freedesktop.org/mailman/listinfo/nouveau > -- > Sincerely, > Lyude Paul (she/her) > Software Engineer at Red Hat > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Skeggs Subject: Re: [PATCH 1/2] drm/nouveau/kms/nv50-: Program notifier offset before requesting disp caps Date: Mon, 31 Aug 2020 14:26:19 +1000 Message-ID: References: <20200824183253.826343-1-lyude@redhat.com> <20200824183253.826343-2-lyude@redhat.com> <76392bff28359a88fbdf0857f011e0ed9f666dc4.camel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <76392bff28359a88fbdf0857f011e0ed9f666dc4.camel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: Lyude Paul Cc: Sasha Levin , David Airlie , ML nouveau , open list , "open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS" , Ben Skeggs , Daniel Vetter , stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: nouveau.vger.kernel.org On Wed, 26 Aug 2020 at 02:52, Lyude Paul wrote: > > On Tue, 2020-08-25 at 08:28 +1000, Ben Skeggs wrote: > > On Tue, 25 Aug 2020 at 04:33, Lyude Paul wrote: > > > Not entirely sure why this never came up when I originally tested this > > > (maybe some BIOSes already have this setup?) but the ->caps_init vfunc > > > appears to cause the display engine to throw an exception on driver > > > init, at least on my ThinkPad P72: > > > > > > nouveau 0000:01:00.0: disp: chid 0 mthd 008c data 00000000 0000508c 0000102b > > > > > > This is magic nvidia speak for "You need to have the DMA notifier offset > > > programmed before you can call NV507D_GET_CAPABILITIES." So, let's fix > > > this by doing that, and also perform an update afterwards to prevent > > > racing with the GPU when reading capabilities. > > > > > > Changes since v1: > > > * Don't just program the DMA notifier offset, make sure to actually > > > perform an update > > I'm not sure there's a need to send an Update() method here, I believe > > GetCapabilities() is an action method on its own right? > > > > I'm not entirely sure about this part tbh. I do know that we need to call > GetCapabilities() _after_ the DMA notifier offset is programmed. But, my > assumption was that if GetCapabilities() requires a DMA notifier offset to store > its results in, we'd probably want to fire an update or something to make sure > that we're not reading before it finishes writing capabilities? We definitely want to *wait* on GetCapabilities() finishing, I believe it should also update the notifier the same (or similar) way Update() does. But I don't think we want to send an Update() here, it'll actually trigger a modeset (which, on earlier HW, will tear down the boot mode. Not sure about current HW, it might preserve state), and we may not want that to happen there. Ben. > > > Ben. > > > > > Signed-off-by: Lyude Paul > > > Fixes: 4a2cb4181b07 ("drm/nouveau/kms/nv50-: Probe SOR and PIOR caps for DP > > > interlacing support") > > > Cc: # v5.8+ > > > --- > > > drivers/gpu/drm/nouveau/dispnv50/core507d.c | 25 ++++++++++++++++----- > > > 1 file changed, 19 insertions(+), 6 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/nouveau/dispnv50/core507d.c > > > b/drivers/gpu/drm/nouveau/dispnv50/core507d.c > > > index e341f572c2696..5e86feec3b720 100644 > > > --- a/drivers/gpu/drm/nouveau/dispnv50/core507d.c > > > +++ b/drivers/gpu/drm/nouveau/dispnv50/core507d.c > > > @@ -65,13 +65,26 @@ core507d_ntfy_init(struct nouveau_bo *bo, u32 offset) > > > int > > > core507d_caps_init(struct nouveau_drm *drm, struct nv50_disp *disp) > > > { > > > - u32 *push = evo_wait(&disp->core->chan, 2); > > > + struct nv50_core *core = disp->core; > > > + u32 interlock[NV50_DISP_INTERLOCK__SIZE] = {0}; > > > + u32 *push; > > > > > > - if (push) { > > > - evo_mthd(push, 0x008c, 1); > > > - evo_data(push, 0x0); > > > - evo_kick(push, &disp->core->chan); > > > - } > > > + core->func->ntfy_init(disp->sync, NV50_DISP_CORE_NTFY); > > > + > > > + push = evo_wait(&core->chan, 4); > > > + if (!push) > > > + return 0; > > > + > > > + evo_mthd(push, 0x0084, 1); > > > + evo_data(push, 0x80000000 | NV50_DISP_CORE_NTFY); > > > + evo_mthd(push, 0x008c, 1); > > > + evo_data(push, 0x0); > > > + evo_kick(push, &core->chan); > > > + > > > + core->func->update(core, interlock, false); > > > + if (core->func->ntfy_wait_done(disp->sync, NV50_DISP_CORE_NTFY, > > > + core->chan.base.device)) > > > + NV_ERROR(drm, "core notifier timeout\n"); > > > > > > return 0; > > > } > > > -- > > > 2.26.2 > > > > > > _______________________________________________ > > > Nouveau mailing list > > > Nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org > > > https://lists.freedesktop.org/mailman/listinfo/nouveau > -- > Sincerely, > Lyude Paul (she/her) > Software Engineer at Red Hat > 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=-9.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,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 9FEE6C433E6 for ; Mon, 31 Aug 2020 04:26:32 +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 6918B20782 for ; Mon, 31 Aug 2020 04:26:32 +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="IC5nDs49" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6918B20782 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 B229189CB5; Mon, 31 Aug 2020 04:26:31 +0000 (UTC) Received: from mail-yb1-xb41.google.com (mail-yb1-xb41.google.com [IPv6:2607:f8b0:4864:20::b41]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6A3F389CB5; Mon, 31 Aug 2020 04:26:31 +0000 (UTC) Received: by mail-yb1-xb41.google.com with SMTP id y134so3284752yby.2; Sun, 30 Aug 2020 21:26:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=PX06aBk627NQ1JeMegFd6B64tEFsLtmyNkqRlailfm0=; b=IC5nDs49gJJNp2v81GvqILFp/15eYtDl2QXUOSAriKrk+Im/ZtF0wapcjFhYD1Aee2 jvbpHrmUBKZXPH50RHisaYAu6eL3nQMi8tqIbaQ0/GVrplidaSlxi0XkF9MZl9ZISJUy 4R6NeoUFpvYWgz/AVuuJruEx6FpoghNJLz+43yhjUyTFi+RgQA0FMEjf7VmO0Gn4rpOp K/qD0gy4DvulktUJNfw234A3UgA/n0f5FM+/q+PywIVycMRHERMlSkWhhpulpNbrvxve NZ2SJEQXzdPfvLg/ZZLsNRwFLSf7nvcbLvCRacQlOO83T58wRYi8uvtv/ICk4aX+fulv i55g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=PX06aBk627NQ1JeMegFd6B64tEFsLtmyNkqRlailfm0=; b=HLuGSlEEGxoizUrTMjsZDU5ABZkisSP4vcEG7/2WEjGCK6bfqnNrcy0buWd8BLl/S1 4kY1BcGjP275vPtxr+s66xZseGWcb+jZkZ5be346EQFvrg4fFeYS0D1bIWuY0Jht8pAD wWUR1Jz13UW7xcCqWvCcD/UK0R1mHAFFnmy2RrQxK5DnFye1pS7fldRW7lrYbVKj5iuM 0MIgl24zg3qIG6l9tivZqaMxDEq5FGd/iSvPAWfIx+h89NiaJTheGr4LoE2nPQCicTTg Qdpr2p9eQd/tmK+CmsyE3L6aFCtXs/kQDhHn+sajcAYymWsERGA3XCQM24b4hv+ZjwtM RdcQ== X-Gm-Message-State: AOAM53095fGGWaJJTcqLdBccmEImdcE/94unbuKY6vKaell8cAtupIHd mVozZvANyO7FRyPcksx0zKgyTtCnfSx3SXhSLNk= X-Google-Smtp-Source: ABdhPJy+0rEbq+GkNgtCw3GXB22ZHNHLhDwqJ7psgye+ciyrN8LcA9ntQoXdSFcOYdxLiOIsyTwz2cd2MlTJH1iqhGY= X-Received: by 2002:a25:c4c5:: with SMTP id u188mr16615125ybf.162.1598847990436; Sun, 30 Aug 2020 21:26:30 -0700 (PDT) MIME-Version: 1.0 References: <20200824183253.826343-1-lyude@redhat.com> <20200824183253.826343-2-lyude@redhat.com> <76392bff28359a88fbdf0857f011e0ed9f666dc4.camel@redhat.com> In-Reply-To: <76392bff28359a88fbdf0857f011e0ed9f666dc4.camel@redhat.com> From: Ben Skeggs Date: Mon, 31 Aug 2020 14:26:19 +1000 Message-ID: Subject: Re: [Nouveau] [PATCH 1/2] drm/nouveau/kms/nv50-: Program notifier offset before requesting disp caps To: Lyude Paul 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: Sasha Levin , David Airlie , ML nouveau , open list , "open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS" , Ben Skeggs , stable@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Wed, 26 Aug 2020 at 02:52, Lyude Paul wrote: > > On Tue, 2020-08-25 at 08:28 +1000, Ben Skeggs wrote: > > On Tue, 25 Aug 2020 at 04:33, Lyude Paul wrote: > > > Not entirely sure why this never came up when I originally tested this > > > (maybe some BIOSes already have this setup?) but the ->caps_init vfunc > > > appears to cause the display engine to throw an exception on driver > > > init, at least on my ThinkPad P72: > > > > > > nouveau 0000:01:00.0: disp: chid 0 mthd 008c data 00000000 0000508c 0000102b > > > > > > This is magic nvidia speak for "You need to have the DMA notifier offset > > > programmed before you can call NV507D_GET_CAPABILITIES." So, let's fix > > > this by doing that, and also perform an update afterwards to prevent > > > racing with the GPU when reading capabilities. > > > > > > Changes since v1: > > > * Don't just program the DMA notifier offset, make sure to actually > > > perform an update > > I'm not sure there's a need to send an Update() method here, I believe > > GetCapabilities() is an action method on its own right? > > > > I'm not entirely sure about this part tbh. I do know that we need to call > GetCapabilities() _after_ the DMA notifier offset is programmed. But, my > assumption was that if GetCapabilities() requires a DMA notifier offset to store > its results in, we'd probably want to fire an update or something to make sure > that we're not reading before it finishes writing capabilities? We definitely want to *wait* on GetCapabilities() finishing, I believe it should also update the notifier the same (or similar) way Update() does. But I don't think we want to send an Update() here, it'll actually trigger a modeset (which, on earlier HW, will tear down the boot mode. Not sure about current HW, it might preserve state), and we may not want that to happen there. Ben. > > > Ben. > > > > > Signed-off-by: Lyude Paul > > > Fixes: 4a2cb4181b07 ("drm/nouveau/kms/nv50-: Probe SOR and PIOR caps for DP > > > interlacing support") > > > Cc: # v5.8+ > > > --- > > > drivers/gpu/drm/nouveau/dispnv50/core507d.c | 25 ++++++++++++++++----- > > > 1 file changed, 19 insertions(+), 6 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/nouveau/dispnv50/core507d.c > > > b/drivers/gpu/drm/nouveau/dispnv50/core507d.c > > > index e341f572c2696..5e86feec3b720 100644 > > > --- a/drivers/gpu/drm/nouveau/dispnv50/core507d.c > > > +++ b/drivers/gpu/drm/nouveau/dispnv50/core507d.c > > > @@ -65,13 +65,26 @@ core507d_ntfy_init(struct nouveau_bo *bo, u32 offset) > > > int > > > core507d_caps_init(struct nouveau_drm *drm, struct nv50_disp *disp) > > > { > > > - u32 *push = evo_wait(&disp->core->chan, 2); > > > + struct nv50_core *core = disp->core; > > > + u32 interlock[NV50_DISP_INTERLOCK__SIZE] = {0}; > > > + u32 *push; > > > > > > - if (push) { > > > - evo_mthd(push, 0x008c, 1); > > > - evo_data(push, 0x0); > > > - evo_kick(push, &disp->core->chan); > > > - } > > > + core->func->ntfy_init(disp->sync, NV50_DISP_CORE_NTFY); > > > + > > > + push = evo_wait(&core->chan, 4); > > > + if (!push) > > > + return 0; > > > + > > > + evo_mthd(push, 0x0084, 1); > > > + evo_data(push, 0x80000000 | NV50_DISP_CORE_NTFY); > > > + evo_mthd(push, 0x008c, 1); > > > + evo_data(push, 0x0); > > > + evo_kick(push, &core->chan); > > > + > > > + core->func->update(core, interlock, false); > > > + if (core->func->ntfy_wait_done(disp->sync, NV50_DISP_CORE_NTFY, > > > + core->chan.base.device)) > > > + NV_ERROR(drm, "core notifier timeout\n"); > > > > > > return 0; > > > } > > > -- > > > 2.26.2 > > > > > > _______________________________________________ > > > Nouveau mailing list > > > Nouveau@lists.freedesktop.org > > > https://lists.freedesktop.org/mailman/listinfo/nouveau > -- > Sincerely, > Lyude Paul (she/her) > Software Engineer at Red Hat > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel