diff options
Diffstat (limited to 'drm-nouveau-pmu-do-not-assume-a-PMU-is-present.patch')
| -rw-r--r-- | drm-nouveau-pmu-do-not-assume-a-PMU-is-present.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/drm-nouveau-pmu-do-not-assume-a-PMU-is-present.patch b/drm-nouveau-pmu-do-not-assume-a-PMU-is-present.patch new file mode 100644 index 000000000..6ad5796e8 --- /dev/null +++ b/drm-nouveau-pmu-do-not-assume-a-PMU-is-present.patch @@ -0,0 +1,31 @@ +From 65fbb05cbbf9ef7f531712634c3e914b54171707 Mon Sep 17 00:00:00 2001 +From: Alexandre Courbot <acourbot@nvidia.com> +Date: Thu, 3 Sep 2015 17:39:52 +0900 +Subject: [PATCH] drm/nouveau/pmu: do not assume a PMU is present + +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. + +Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> +Signed-off-by: Ben Skeggs <bskeggs@redhat.com> +--- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c +index 27a79c0c3888..d95eb8659d1b 100644 +--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c ++++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c +@@ -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); + } + +-- +2.5.0 + |