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

Commit d9632805 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: handle special cases for vddc
  drm/radeon/kms: fix num_banks tiling config for fusion
parents 7a1f7b3d ee4017f4

drivers/gpu/drm/radeon/evergreen.c

+2 −2
Original line number Diff line number Diff line
@@ -2013,9 +2013,9 @@ static void evergreen_gpu_init(struct radeon_device *rdev) 
		rdev->config.evergreen.tile_config |= (3 << 0);

		break;

	}

	/* num banks is 8 on all fusion asics */

	/* num banks is 8 on all fusion asics. 0 = 4, 1 = 8, 2 = 16 */

	if (rdev->flags & RADEON_IS_IGP)

		rdev->config.evergreen.tile_config |= 8 << 4;

		rdev->config.evergreen.tile_config |= 1 << 4;

	else

		rdev->config.evergreen.tile_config |=

			((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) << 4;

drivers/gpu/drm/radeon/radeon.h

+1 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ void radeon_pm_resume(struct radeon_device *rdev); 
void radeon_combios_get_power_modes(struct radeon_device *rdev);

void radeon_atombios_get_power_modes(struct radeon_device *rdev);

void radeon_atom_set_voltage(struct radeon_device *rdev, u16 voltage_level, u8 voltage_type);

int radeon_atom_get_max_vddc(struct radeon_device *rdev, u16 *voltage);

void rs690_pm_info(struct radeon_device *rdev);

extern int rv6xx_get_temp(struct radeon_device *rdev);

extern int rv770_get_temp(struct radeon_device *rdev);

drivers/gpu/drm/radeon/radeon_atombios.c

+36 −0
Original line number Diff line number Diff line
@@ -2320,6 +2320,14 @@ static bool radeon_atombios_parse_pplib_clock_info(struct radeon_device *rdev, 
			le16_to_cpu(clock_info->r600.usVDDC);

	}



	/* patch up vddc if necessary */

	if (rdev->pm.power_state[state_index].clock_info[mode_index].voltage.voltage == 0xff01) {

		u16 vddc;



		if (radeon_atom_get_max_vddc(rdev, &vddc) == 0)

			rdev->pm.power_state[state_index].clock_info[mode_index].voltage.voltage = vddc;

	}



	if (rdev->flags & RADEON_IS_IGP) {

		/* skip invalid modes */

		if (rdev->pm.power_state[state_index].clock_info[mode_index].sclk == 0)
@@ -2630,7 +2638,35 @@ void radeon_atom_set_voltage(struct radeon_device *rdev, u16 voltage_level, u8 v 
	atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);

}



int radeon_atom_get_max_vddc(struct radeon_device *rdev,

			     u16 *voltage)

{

	union set_voltage args;

	int index = GetIndexIntoMasterTable(COMMAND, SetVoltage);

	u8 frev, crev;



	if (!atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev))

		return -EINVAL;



	switch (crev) {

	case 1:

		return -EINVAL;

	case 2:

		args.v2.ucVoltageType = SET_VOLTAGE_GET_MAX_VOLTAGE;

		args.v2.ucVoltageMode = 0;

		args.v2.usVoltageLevel = 0;



		atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);



		*voltage = le16_to_cpu(args.v2.usVoltageLevel);

		break;

	default:

		DRM_ERROR("Unknown table version %d, %d\n", frev, crev);

		return -EINVAL;

	}



	return 0;

}



void radeon_atom_initialize_bios_scratch_regs(struct drm_device *dev)

{