Skip to contentSkip to conversation

Patch "drm/nouveau/pmu: do not assume a PMU is present" has been added to the 4.3-stable tree

PATCH [email protected] 1 participant 1 message Feb 14, 2016

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

drm/nouveau/pmu: do not assume a PMU is present

to the 4.3-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-nouveau-pmu-do-not-assume-a-pmu-is-present.patch
and it can be found in the queue-4.3 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 579b7c58215329803ce184704463de09f0f310ac Mon Sep 17 00:00:00 2001

From: Alexandre Courbot <[email protected]>
Date: Thu, 3 Sep 2015 17:39:52 +0900
Subject: drm/nouveau/pmu: do not assume a PMU is present

From: Alexandre Courbot <[email protected]>

commit 579b7c58215329803ce184704463de09f0f310ac upstream.

Some devices may not have a PMU. Avoid a NULL pointer dereference in such cases by checking whether the pointer given to nvkm_pmu_pgob() is valid.

---
 drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c +1 -1
@@ -28,7 +28,7 @@
 void
 nvkm_pmu_pgob(struct nvkm_pmu *pmu, bool enable)
 {
-	if (pmu->func->pgob)
+	if (pmu && pmu->func->pgob)
 		pmu->func->pgob(pmu, enable);
 }
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.3/drm-nouveau-pmu-do-not-assume-a-pmu-is-present.patch