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

Commit 4795b95a authored by Dave Airlie's avatar Dave Airlie
Browse files

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

r600 dpm fixes, old school card dac fixes, lockup fixes
endian fixes
* 'drm-fixes-3.11' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon/dpm: fix r600_enable_sclk_control()
  drm/radeon/dpm: implement force performance levels for rv6xx
  drm/radeon/dpm: fix displaygap programming on rv6xx
  drm/radeon/dpm: fix a typo in the rv6xx mclk setup
  drm/radeon: fix combios tables on older cards
  drm/radeon: improve dac adjust heuristics for legacy pdac
  drm/radeon: Another card with wrong primary dac adj
  drm/radeon: fix endian issues with DP handling (v3)
  drm/radeon/vm: only align the pt base to 32k
  drm/radeon: wait for 3D idle before using CP DMA
parents 07bc9dc1 f5d9b7f0

drivers/gpu/drm/radeon/atombios_dp.c

+39 −4
Original line number Diff line number Diff line
@@ -44,6 +44,41 @@ static char *pre_emph_names[] = { 
};



/***** radeon AUX functions *****/



/* Atom needs data in little endian format

 * so swap as appropriate when copying data to

 * or from atom. Note that atom operates on

 * dw units.

 */

static void radeon_copy_swap(u8 *dst, u8 *src, u8 num_bytes, bool to_le)

{

#ifdef __BIG_ENDIAN

	u8 src_tmp[20], dst_tmp[20]; /* used for byteswapping */

	u32 *dst32, *src32;

	int i;



	memcpy(src_tmp, src, num_bytes);

	src32 = (u32 *)src_tmp;

	dst32 = (u32 *)dst_tmp;

	if (to_le) {

		for (i = 0; i < ((num_bytes + 3) / 4); i++)

			dst32[i] = cpu_to_le32(src32[i]);

		memcpy(dst, dst_tmp, num_bytes);

	} else {

		u8 dws = num_bytes & ~3;

		for (i = 0; i < ((num_bytes + 3) / 4); i++)

			dst32[i] = le32_to_cpu(src32[i]);

		memcpy(dst, dst_tmp, dws);

		if (num_bytes % 4) {

			for (i = 0; i < (num_bytes % 4); i++)

				dst[dws+i] = dst_tmp[dws+i];

		}

	}

#else

	memcpy(dst, src, num_bytes);

#endif

}



union aux_channel_transaction {

	PROCESS_AUX_CHANNEL_TRANSACTION_PS_ALLOCATION v1;

	PROCESS_AUX_CHANNEL_TRANSACTION_PARAMETERS_V2 v2;
@@ -65,10 +100,10 @@ static int radeon_process_aux_ch(struct radeon_i2c_chan *chan, 


	base = (unsigned char *)(rdev->mode_info.atom_context->scratch + 1);



	memcpy(base, send, send_bytes);

	radeon_copy_swap(base, send, send_bytes, true);



	args.v1.lpAuxRequest = 0 + 4;

	args.v1.lpDataOut = 16 + 4;

	args.v1.lpAuxRequest = cpu_to_le16((u16)(0 + 4));

	args.v1.lpDataOut = cpu_to_le16((u16)(16 + 4));

	args.v1.ucDataOutLen = 0;

	args.v1.ucChannelID = chan->rec.i2c_id;

	args.v1.ucDelay = delay / 10;
@@ -102,7 +137,7 @@ static int radeon_process_aux_ch(struct radeon_i2c_chan *chan, 
		recv_bytes = recv_size;



	if (recv && recv_size)

		memcpy(recv, base + 16, recv_bytes);

		radeon_copy_swap(recv, base + 16, recv_bytes, false);



	return recv_bytes;

}

drivers/gpu/drm/radeon/r600.c

+4 −1
Original line number Diff line number Diff line
@@ -3166,7 +3166,7 @@ int r600_copy_cpdma(struct radeon_device *rdev, 


	size_in_bytes = (num_gpu_pages << RADEON_GPU_PAGE_SHIFT);

	num_loops = DIV_ROUND_UP(size_in_bytes, 0x1fffff);

	r = radeon_ring_lock(rdev, ring, num_loops * 6 + 21);

	r = radeon_ring_lock(rdev, ring, num_loops * 6 + 24);

	if (r) {

		DRM_ERROR("radeon: moving bo (%d).\n", r);

		radeon_semaphore_free(rdev, &sem, NULL);
@@ -3181,6 +3181,9 @@ int r600_copy_cpdma(struct radeon_device *rdev, 
		radeon_semaphore_free(rdev, &sem, NULL);

	}



	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONFIG_REG, 1));

	radeon_ring_write(ring, (WAIT_UNTIL - PACKET3_SET_CONFIG_REG_OFFSET) >> 2);

	radeon_ring_write(ring, WAIT_3D_IDLE_bit);

	for (i = 0; i < num_loops; i++) {

		cur_size_in_bytes = size_in_bytes;

		if (cur_size_in_bytes > 0x1fffff)

drivers/gpu/drm/radeon/r600_dpm.c

+2 −2
Original line number Diff line number Diff line
@@ -278,9 +278,9 @@ bool r600_dynamicpm_enabled(struct radeon_device *rdev) 
void r600_enable_sclk_control(struct radeon_device *rdev, bool enable)

{

	if (enable)

		WREG32_P(GENERAL_PWRMGT, 0, ~SCLK_PWRMGT_OFF);

		WREG32_P(SCLK_PWRMGT_CNTL, 0, ~SCLK_PWRMGT_OFF);

	else

		WREG32_P(GENERAL_PWRMGT, SCLK_PWRMGT_OFF, ~SCLK_PWRMGT_OFF);

		WREG32_P(SCLK_PWRMGT_CNTL, SCLK_PWRMGT_OFF, ~SCLK_PWRMGT_OFF);

}



void r600_enable_mclk_control(struct radeon_device *rdev, bool enable)

drivers/gpu/drm/radeon/radeon_asic.c

+1 −0
Original line number Diff line number Diff line
@@ -1161,6 +1161,7 @@ static struct radeon_asic rv6xx_asic = { 
		.get_mclk = &rv6xx_dpm_get_mclk,

		.print_power_state = &rv6xx_dpm_print_power_state,

		.debugfs_print_current_performance_level = &rv6xx_dpm_debugfs_print_current_performance_level,

		.force_performance_level = &rv6xx_dpm_force_performance_level,

	},

	.pflip = {

		.pre_page_flip = &rs600_pre_page_flip,

drivers/gpu/drm/radeon/radeon_asic.h

+2 −0
Original line number Diff line number Diff line
@@ -421,6 +421,8 @@ void rv6xx_dpm_print_power_state(struct radeon_device *rdev, 
				 struct radeon_ps *ps);

void rv6xx_dpm_debugfs_print_current_performance_level(struct radeon_device *rdev,

						       struct seq_file *m);

int rv6xx_dpm_force_performance_level(struct radeon_device *rdev,

				      enum radeon_dpm_forced_level level);

/* rs780 dpm */

int rs780_dpm_init(struct radeon_device *rdev);

int rs780_dpm_enable(struct radeon_device *rdev);