Skip to content

Commit 38d4e5c

Browse files
committed
drm/nouveau/pmu: Add missing callbacks for Tegra devices
Fixes a crash booting on those platforms with nouveau. Fixes: 4cdd245 ("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
1 parent d14eb80 commit 38d4e5c

4 files changed

Lines changed: 4 additions & 1 deletion

File tree

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ gm20b_pmu = {
216216
.intr = gt215_pmu_intr,
217217
.recv = gm20b_pmu_recv,
218218
.initmsg = gm20b_pmu_initmsg,
219+
.reset = gf100_pmu_reset,
219220
};
220221

221222
#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp102.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
#include "priv.h"
2525

26-
static void
26+
void
2727
gp102_pmu_reset(struct nvkm_pmu *pmu)
2828
{
2929
struct nvkm_device *device = pmu->subdev.device;

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ gp10b_pmu = {
8383
.intr = gt215_pmu_intr,
8484
.recv = gm20b_pmu_recv,
8585
.initmsg = gm20b_pmu_initmsg,
86+
.reset = gp102_pmu_reset,
8687
};
8788

8889
#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ int gt215_pmu_send(struct nvkm_pmu *, u32[2], u32, u32, u32, u32);
4141

4242
bool gf100_pmu_enabled(struct nvkm_pmu *);
4343
void gf100_pmu_reset(struct nvkm_pmu *);
44+
void gp102_pmu_reset(struct nvkm_pmu *pmu);
4445

4546
void gk110_pmu_pgob(struct nvkm_pmu *, bool);
4647

0 commit comments

Comments
 (0)