xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/nouveau/pmu: Add missing callbacks for Tegra devices

Browse Source 
commit 38d4e5cf5b08798f093374e53c2f4609d5382dd5 upstream.

Fixes a crash booting on those platforms with nouveau.

Fixes: 4cdd2450bf73 ("drm/nouveau/pmu/gm200-: use alternate falcon reset sequence")
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Karol Herbst <kherbst@redhat.com>
Cc: dri-devel@lists.freedesktop.org
Cc: nouveau@lists.freedesktop.org
Cc: <stable@vger.kernel.org> # v5.17+
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220322124800.2605463-1-kherbst@redhat.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Karol Herbst
2022-03-22 13:48:00 +01:00
committed by Greg Kroah-Hartman
parent 786ae8de3a
commit 326b408e7e
4 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c
View File

@@ -216,6 +216,7 @@ gm20b_pmu = {
.intr = gt215_pmu_intr, .intr = gt215_pmu_intr,
.recv = gm20b_pmu_recv, .recv = gm20b_pmu_recv,
.initmsg = gm20b_pmu_initmsg, .initmsg = gm20b_pmu_initmsg,
.reset = gf100_pmu_reset,
}; };
#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC) #if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)

2
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp102.c
View File

@@ -23,7 +23,7 @@
*/ */
#include "priv.h" #include "priv.h"
static void void
gp102_pmu_reset(struct nvkm_pmu *pmu) gp102_pmu_reset(struct nvkm_pmu *pmu)
{ {
struct nvkm_device *device = pmu->subdev.device; struct nvkm_device *device = pmu->subdev.device;

1
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c
View File

@@ -83,6 +83,7 @@ gp10b_pmu = {
.intr = gt215_pmu_intr, .intr = gt215_pmu_intr,
.recv = gm20b_pmu_recv, .recv = gm20b_pmu_recv,
.initmsg = gm20b_pmu_initmsg, .initmsg = gm20b_pmu_initmsg,
.reset = gp102_pmu_reset,
}; };
#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC) #if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)

1
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h
View File

@@ -41,6 +41,7 @@ int gt215_pmu_send(struct nvkm_pmu *, u32[2], u32, u32, u32, u32);
bool gf100_pmu_enabled(struct nvkm_pmu *); bool gf100_pmu_enabled(struct nvkm_pmu *);
void gf100_pmu_reset(struct nvkm_pmu *); void gf100_pmu_reset(struct nvkm_pmu *);
void gp102_pmu_reset(struct nvkm_pmu *pmu);
void gk110_pmu_pgob(struct nvkm_pmu *, bool); void gk110_pmu_pgob(struct nvkm_pmu *, bool);