diff options
| author | Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com> | 2012-09-25 10:31:40 +0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-03 13:13:12 +1000 |
| commit | d89c8ce07168ef6cd16c71d0a9f618829e866e87 (patch) | |
| tree | 418e10f2489d4222f2326e8f20cfeca14d1ec9cb /drivers/gpu/drm | |
| parent | acac7bdba61226502a230db9245ca426a67102a9 (diff) | |
| download | linux-3.10-d89c8ce07168ef6cd16c71d0a9f618829e866e87.tar.gz linux-3.10-d89c8ce07168ef6cd16c71d0a9f618829e866e87.tar.bz2 linux-3.10-d89c8ce07168ef6cd16c71d0a9f618829e866e87.zip | |
drm/nouveau: fix pm initialization order
If nouveau_pm_perflvl_get() fails, pm->profiles list will be left
uninitialized, which causes oops during nouveau_pm_fini().
Move INIT_LIST_HEAD before call to nouveau_pm_perflvl_get().
Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_pm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c index 3c55ec2366d..d2f2de67f68 100644 --- a/drivers/gpu/drm/nouveau/nouveau_pm.c +++ b/drivers/gpu/drm/nouveau/nouveau_pm.c @@ -916,6 +916,8 @@ nouveau_pm_init(struct drm_device *dev) nouveau_volt_init(dev); nouveau_temp_init(dev); + INIT_LIST_HEAD(&pm->profiles); + /* determine current ("boot") performance level */ ret = nouveau_pm_perflvl_get(dev, &pm->boot); if (ret) { @@ -927,7 +929,6 @@ nouveau_pm_init(struct drm_device *dev) strncpy(pm->boot.profile.name, "boot", 4); pm->boot.profile.func = &nouveau_pm_static_profile_func; - INIT_LIST_HEAD(&pm->profiles); list_add(&pm->boot.profile.head, &pm->profiles); pm->profile_ac = &pm->boot.profile; |