diff options
| author | Alexandre Courbot <[email protected]> | 2016-11-17 16:37:29 +0900 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2017-03-07 17:05:11 +1000 |
| commit | 485a20eff20a2cbc55c9061724356cae3df01781 (patch) | |
| tree | 14d0e2c9053fc633bc8101a08b7bb00ff48b5d58 | |
| parent | ba735d061dcbbb061721f302f1ef519c547d5bab (diff) | |
drm/nouveau/pmu: make sure the reset hook exists before running it
Some PMU implementations (in particular the ones managed by secure
boot) may not have a reset() hook. Make sure we don't crash in that
case.
Signed-off-by: Alexandre Courbot <[email protected]>
Signed-off-by: Ben Skeggs <[email protected]>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c index a73f690eb4b5..ad4ac4e8b29e 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c @@ -85,7 +85,8 @@ nvkm_pmu_reset(struct nvkm_pmu *pmu) ); /* Reset. */ - pmu->func->reset(pmu); + if (pmu->func->reset) + pmu->func->reset(pmu); /* Wait for IMEM/DMEM scrubbing to be complete. */ nvkm_msec(device, 2000, |