Przeglądaj źródła

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>
Dmitry Eremin-Solenikov 12 lat temu
rodzic
commit
d89c8ce071
1 zmienionych plików z 2 dodań i 1 usunięć
  1. 2 1
      drivers/gpu/drm/nouveau/nouveau_pm.c

+ 2 - 1
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;