Received-SPF: pass (google.com: domain of linux-kernel+bounces-20109-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Precedence: bulk
MIME-Version: 1.0
References: <20240108122823.2090312-1-sashal@kernel.org> <20240108122823.2090312-5-sashal@kernel.org>
In-Reply-To: <20240108122823.2090312-5-sashal@kernel.org>
From: David Airlie <airlied@redhat.com>
Date: Tue, 9 Jan 2024 06:51:25 +1000
Message-ID: <CAMwc25rAm1ndSiofWMMmQ1BeB0XxBvsHpcvaDKXUwEZp72iwEA@mail.gmail.com>
Subject: Re: [PATCH AUTOSEL 6.1 5/5] nouveau: fix disp disabling with GSP
To: Sasha Levin <sashal@kernel.org>
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, 
	Dave Airlie <airlied@gmail.com>, kherbst@redhat.com, lyude@redhat.com, dakr@redhat.com, 
	daniel@ffwll.ch, bskeggs@redhat.com, dri-devel@lists.freedesktop.org, 
	nouveau@lists.freedesktop.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

NAK for backporting this to anything, it is just a fix for 6.7


On Mon, Jan 8, 2024 at 10:28=E2=80=AFPM Sasha Levin <sashal@kernel.org> wro=
te:
>
> From: Dave Airlie <airlied@gmail.com>
>
> [ Upstream commit 7854ea0e408d7f2e8faaada1773f3ddf9cb538f5 ]
>
> This func ptr here is normally static allocation, but gsp r535
> uses a dynamic pointer, so we need to handle that better.
>
> This fixes a crash with GSP when you use config=3Ddisp=3D0 to avoid
> disp problems.
>
> Signed-off-by: Dave Airlie <airlied@redhat.com>
> Link: https://patchwork.freedesktop.org/patch/msgid/20231222043308.309008=
9-4-airlied@gmail.com
> Signed-off-by: Sasha Levin <sashal@kernel.org>
> ---
>  drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c b/drivers/gp=
u/drm/nouveau/nvkm/engine/disp/base.c
> index 65c99d948b686..ae47eabd5d0bd 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c
> @@ -359,7 +359,7 @@ nvkm_disp_oneinit(struct nvkm_engine *engine)
>         if (ret)
>                 return ret;
>
> -       if (disp->func->oneinit) {
> +       if (disp->func && disp->func->oneinit) {
>                 ret =3D disp->func->oneinit(disp);
>                 if (ret)
>                         return ret;
> @@ -461,8 +461,10 @@ nvkm_disp_new_(const struct nvkm_disp_func *func, st=
ruct nvkm_device *device,
>         spin_lock_init(&disp->client.lock);
>
>         ret =3D nvkm_engine_ctor(&nvkm_disp, device, type, inst, true, &d=
isp->engine);
> -       if (ret)
> +       if (ret) {
> +               disp->func =3D NULL;
>                 return ret;
> +       }
>
>         if (func->super) {
>                 disp->super.wq =3D create_singlethread_workqueue("nvkm-di=
sp");
> --
> 2.43.0
>