Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d89c8ce0 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Ben Skeggs
Browse files

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: default avatarDmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent acac7bdb

drivers/gpu/drm/nouveau/nouveau_pm.c

+2 −1
Original line number Diff line number Diff line
@@ -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;