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

Commit 52e4c2a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon/kms/combios: fix dynamic allocation of PM clock modes
parents 3439a8da a7c36fd8

drivers/gpu/drm/radeon/radeon_combios.c

+19 −8
Original line number Original line Diff line number Diff line
@@ -2563,14 +2563,17 @@ void radeon_combios_get_power_modes(struct radeon_device *rdev) 




	/* allocate 2 power states */

	/* allocate 2 power states */

	rdev->pm.power_state = kzalloc(sizeof(struct radeon_power_state) * 2, GFP_KERNEL);

	rdev->pm.power_state = kzalloc(sizeof(struct radeon_power_state) * 2, GFP_KERNEL);

	if (!rdev->pm.power_state) {

	if (rdev->pm.power_state) {

		rdev->pm.default_power_state_index = state_index;

		/* allocate 1 clock mode per state */

		rdev->pm.num_power_states = 0;

		rdev->pm.power_state[0].clock_info =



			kzalloc(sizeof(struct radeon_pm_clock_info) * 1, GFP_KERNEL);

		rdev->pm.current_power_state_index = rdev->pm.default_power_state_index;

		rdev->pm.power_state[1].clock_info =

		rdev->pm.current_clock_mode_index = 0;

			kzalloc(sizeof(struct radeon_pm_clock_info) * 1, GFP_KERNEL);

		return;

		if (!rdev->pm.power_state[0].clock_info ||

	}

		    !rdev->pm.power_state[1].clock_info)

			goto pm_failed;

	} else

		goto pm_failed;





	/* check for a thermal chip */

	/* check for a thermal chip */

	offset = combios_get_table_offset(dev, COMBIOS_OVERDRIVE_INFO_TABLE);

	offset = combios_get_table_offset(dev, COMBIOS_OVERDRIVE_INFO_TABLE);
@@ -2733,6 +2736,14 @@ default_mode: 
	rdev->pm.default_power_state_index = state_index;

	rdev->pm.default_power_state_index = state_index;

	rdev->pm.num_power_states = state_index + 1;

	rdev->pm.num_power_states = state_index + 1;





	rdev->pm.current_power_state_index = rdev->pm.default_power_state_index;

	rdev->pm.current_clock_mode_index = 0;

	return;



pm_failed:

	rdev->pm.default_power_state_index = state_index;

	rdev->pm.num_power_states = 0;



	rdev->pm.current_power_state_index = rdev->pm.default_power_state_index;

	rdev->pm.current_power_state_index = rdev->pm.default_power_state_index;

	rdev->pm.current_clock_mode_index = 0;

	rdev->pm.current_clock_mode_index = 0;

}

}