Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/nouveau/pmu: Add missing callbacks for Tegra devices" failed to apply to 4.14-stable tree

PATCH [email protected] 1 participant 1 message Apr 11, 2022

Subsystems (4)
Stable branch DRM drivers DRM misc nouveau
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 38d4e5cf5b08798f093374e53c2f4609d5382dd5 Mon Sep 17 00:00:00 2001
From: Karol Herbst <[email protected]>
Date: Tue, 22 Mar 2022 13:48:00 +0100
Subject: [PATCH] drm/nouveau/pmu: Add missing callbacks for Tegra devices

Fixes a crash booting on those platforms with nouveau.

Fixes 4cdd2450bf73 ("drm/nouveau/pmu/gm200-: use alternate falcon reset sequence")
Cc Ben Skeggs <[email protected]>
Cc Karol Herbst <[email protected]>
Cc [email protected]
Cc [email protected]
Cc <[email protected]> # v5.17+
Signed-off-by Karol Herbst <[email protected]>
Reviewed-by Lyude Paul <[email protected]>
Link https://patchwork.freedesktop.org/patch/msgid/[email protected]
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c +1 -0
index e1772211b0a4..612310d5d481 100644
@@ -216,6 +216,7 @@ gm20b_pmu = {
 	.intr = gt215_pmu_intr,
 	.recv = gm20b_pmu_recv,
 	.initmsg = gm20b_pmu_initmsg,
+	.reset = gf100_pmu_reset,
 };
 
 #if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp102.c +1 -1
index 6bf7fc1bd1e3..1a6f9c3af5ec 100644
@@ -23,7 +23,7 @@
  */
 #include "priv.h"
 
-static void
+void
 gp102_pmu_reset(struct nvkm_pmu *pmu)
 {
 	struct nvkm_device *device = pmu->subdev.device;
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c +1 -0
index ba1583bb618b..94cfb1791af6 100644
@@ -83,6 +83,7 @@ gp10b_pmu = {
 	.intr = gt215_pmu_intr,
 	.recv = gm20b_pmu_recv,
 	.initmsg = gm20b_pmu_initmsg,
+	.reset = gp102_pmu_reset,
 };
 
 #if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h +1 -0
index bcaade758ff7..21abf31f4442 100644
@@ -41,6 +41,7 @@ int gt215_pmu_send(struct nvkm_pmu *, u32[2], u32, u32, u32, u32);
 
 bool gf100_pmu_enabled(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);