mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
718c4fb221
This reverts:
nouveau/gsp: don't check devinit disable on GSP.
and applies a further fix.
It turns out the open gpu driver, checks this register,
but only for display.
Match that behaviour and in the turing path only disable
the display block. (ampere already only does displays).
Fixes: 5d4e8ae6e5 ("nouveau/gsp: don't check devinit disable on GSP.")
Reviewed-by: Danilo Krummrich <dakr@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240408064243.2219527-1-airlied@gmail.com
51 lines
1.7 KiB
C
51 lines
1.7 KiB
C
/*
|
|
* Copyright 2023 Red Hat Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
#include "nv50.h"
|
|
|
|
static void *
|
|
r535_devinit_dtor(struct nvkm_devinit *devinit)
|
|
{
|
|
kfree(devinit->func);
|
|
return devinit;
|
|
}
|
|
|
|
int
|
|
r535_devinit_new(const struct nvkm_devinit_func *hw,
|
|
struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
|
|
struct nvkm_devinit **pdevinit)
|
|
{
|
|
struct nvkm_devinit_func *rm;
|
|
int ret;
|
|
|
|
if (!(rm = kzalloc(sizeof(*rm), GFP_KERNEL)))
|
|
return -ENOMEM;
|
|
|
|
rm->dtor = r535_devinit_dtor;
|
|
rm->post = hw->post;
|
|
rm->disable = hw->disable;
|
|
|
|
ret = nv50_devinit_new_(rm, device, type, inst, pdevinit);
|
|
if (ret)
|
|
kfree(rm);
|
|
|
|
return ret;
|
|
}
|