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

Commit 6c504ecf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm fixes from Dave Airlie:
 "This is just a regular fixes pull apart from the qxl one, it has
  radeon and intel bits in it,

  The intel fixes are for a regression with the RC6 fix and a 3.10 hdmi
  regression, whereas radeon is more DPM fixes, a few lockup fixes and
  some rn50/r100 DAC fixes"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/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/i915: initialize gt_lock early with other spin locks
  drm/i915: fix hdmi portclock limits
  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 2408c2e5 bf903e41

drivers/gpu/drm/i915/i915_dma.c

+1 −0
Original line number Diff line number Diff line
@@ -1498,6 +1498,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
	spin_lock_init(&dev_priv->irq_lock);

	spin_lock_init(&dev_priv->gpu_error.lock);

	spin_lock_init(&dev_priv->rps.lock);

	spin_lock_init(&dev_priv->gt_lock);

	spin_lock_init(&dev_priv->backlight.lock);

	mutex_init(&dev_priv->dpio_lock);

	mutex_init(&dev_priv->rps.hw_lock);

drivers/gpu/drm/i915/intel_hdmi.c

+16 −3
Original line number Diff line number Diff line
@@ -785,10 +785,22 @@ static void intel_disable_hdmi(struct intel_encoder *encoder) 
	}

}



static int hdmi_portclock_limit(struct intel_hdmi *hdmi)

{

	struct drm_device *dev = intel_hdmi_to_dev(hdmi);



	if (IS_G4X(dev))

		return 165000;

	else if (IS_HASWELL(dev))

		return 300000;

	else

		return 225000;

}



static int intel_hdmi_mode_valid(struct drm_connector *connector,

				 struct drm_display_mode *mode)

{

	if (mode->clock > 165000)

	if (mode->clock > hdmi_portclock_limit(intel_attached_hdmi(connector)))

		return MODE_CLOCK_HIGH;

	if (mode->clock < 20000)

		return MODE_CLOCK_LOW;
@@ -806,6 +818,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder, 
	struct drm_device *dev = encoder->base.dev;

	struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode;

	int clock_12bpc = pipe_config->requested_mode.clock * 3 / 2;

	int portclock_limit = hdmi_portclock_limit(intel_hdmi);

	int desired_bpp;



	if (intel_hdmi->color_range_auto) {
@@ -829,7 +842,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder, 
	 * outputs. We also need to check that the higher clock still fits

	 * within limits.

	 */

	if (pipe_config->pipe_bpp > 8*3 && clock_12bpc <= 225000

	if (pipe_config->pipe_bpp > 8*3 && clock_12bpc <= portclock_limit

	    && HAS_PCH_SPLIT(dev)) {

		DRM_DEBUG_KMS("picking bpc to 12 for HDMI output\n");

		desired_bpp = 12*3;
@@ -846,7 +859,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder, 
		pipe_config->pipe_bpp = desired_bpp;

	}



	if (adjusted_mode->clock > 225000) {

	if (adjusted_mode->clock > portclock_limit) {

		DRM_DEBUG_KMS("too high HDMI clock, rejecting mode\n");

		return false;

	}

drivers/gpu/drm/i915/intel_pm.c

+0 −2
Original line number Diff line number Diff line
@@ -5497,8 +5497,6 @@ void intel_gt_init(struct drm_device *dev) 
{

	struct drm_i915_private *dev_priv = dev->dev_private;



	spin_lock_init(&dev_priv->gt_lock);



	if (IS_VALLEYVIEW(dev)) {

		dev_priv->gt.force_wake_get = vlv_force_wake_get;

		dev_priv->gt.force_wake_put = vlv_force_wake_put;

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)