Dmitry Eremin-Solenikov
2012-Sep-25 06:31 UTC
[Nouveau] [PATCH] 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 at mentor.com>
---
drivers/gpu/drm/nouveau/nouveau_pm.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c
b/drivers/gpu/drm/nouveau/nouveau_pm.c
index 3c55ec2..d2f2de6 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;
--
1.7.10.4
Ben Skeggs
2012-Sep-26 01:09 UTC
[Nouveau] [PATCH] drm/nouveau: fix pm initialization order
On Tue, Sep 25, 2012 at 10:31:40AM +0400, Dmitry Eremin-Solenikov wrote:> 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().Pushed, thanks!> > Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin at mentor.com> > --- > drivers/gpu/drm/nouveau/nouveau_pm.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c > index 3c55ec2..d2f2de6 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; > -- > 1.7.10.4 > > _______________________________________________ > Nouveau mailing list > Nouveau at lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/nouveau