Commit 960dfc4e 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:
 "Lots of little small things, nothing too major: nouveau regression
  fixes, vmware fixes for the new hw support, memory leaks in error path
  fixes"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (31 commits)
  drm/radeon/ni: fix typo in dpm sq ramping setup
  drm/radeon/si: fix typo in dpm sq ramping setup
  drm/radeon: fix CP semaphores on CIK
  drm/radeon: delete a stray tab
  drm/radeon: fix display tiling setup on SI
  drm/radeon/dpm: reduce r7xx vblank mclk threshold to 200
  drm/radeon: fill in DRM_CAPs for cursor size
  drm: add DRM_CAPs for cursor size
  drm/radeon: unify bpc handling
  drm/ttm: Fix memory leak in ttm_agp_backend.c
  drm/ttm: declare 'struct device' in ttm_page_alloc.h
  drm/nouveau: fix TTM_PL_TT memtype on pre-nv50
  drm/nv50/disp: use correct register to determine DP display bpp
  drm/nouveau/fb: use correct ram oclass for nv1a hardware
  drm/nv50/gr: add missing nv_error parameter priv
  drm/nouveau: fix ENG_RUNLIST register address
  drm/nv4c/bios: disallow retrieving from prom on nv4x igp's
  drm/nv4c/vga: decode register is in a different place on nv4x igp's
  drm/nv4c/mc: nv4x igp's have a different msi rearm register
  drm/nouveau: set irq_enabled manually
  ...
parents 525b8709 75936c65

drivers/gpu/drm/drm_ioctl.c

+12 −0
Original line number Diff line number Diff line
@@ -296,6 +296,18 @@ int drm_getcap(struct drm_device *dev, void *data, struct drm_file *file_priv) 
	case DRM_CAP_ASYNC_PAGE_FLIP:

		req->value = dev->mode_config.async_page_flip;

		break;

	case DRM_CAP_CURSOR_WIDTH:

		if (dev->mode_config.cursor_width)

			req->value = dev->mode_config.cursor_width;

		else

			req->value = 64;

		break;

	case DRM_CAP_CURSOR_HEIGHT:

		if (dev->mode_config.cursor_height)

			req->value = dev->mode_config.cursor_height;

		else

			req->value = 64;

		break;

	default:

		return -EINVAL;

	}

drivers/gpu/drm/i2c/tda998x_drv.c

+3 −1
Original line number Diff line number Diff line
@@ -1151,8 +1151,10 @@ tda998x_encoder_init(struct i2c_client *client, 


	priv->current_page = 0xff;

	priv->cec = i2c_new_dummy(client->adapter, 0x34);

	if (!priv->cec)

	if (!priv->cec) {

		kfree(priv);

		return -ENODEV;

	}

	priv->dpms = DRM_MODE_DPMS_OFF;



	encoder_slave->slave_priv = priv;

drivers/gpu/drm/i915/intel_display.c

+14 −0
Original line number Diff line number Diff line
@@ -8586,6 +8586,20 @@ static int intel_gen7_queue_flip(struct drm_device *dev, 
	if (ring->id == RCS)

		len += 6;



	/*

	 * BSpec MI_DISPLAY_FLIP for IVB:

	 * "The full packet must be contained within the same cache line."

	 *

	 * Currently the LRI+SRM+MI_DISPLAY_FLIP all fit within the same

	 * cacheline, if we ever start emitting more commands before

	 * the MI_DISPLAY_FLIP we may need to first emit everything else,

	 * then do the cacheline alignment, and finally emit the

	 * MI_DISPLAY_FLIP.

	 */

	ret = intel_ring_cacheline_align(ring);

	if (ret)

		goto err_unpin;



	ret = intel_ring_begin(ring, len);

	if (ret)

		goto err_unpin;

drivers/gpu/drm/i915/intel_dp.c

+13 −6
Original line number Diff line number Diff line
@@ -537,6 +537,7 @@ intel_dp_aux_native_write(struct intel_dp *intel_dp, 
	uint8_t	msg[20];

	int msg_bytes;

	uint8_t	ack;

	int retry;



	if (WARN_ON(send_bytes > 16))

		return -E2BIG;
@@ -548,19 +549,21 @@ intel_dp_aux_native_write(struct intel_dp *intel_dp, 
	msg[3] = send_bytes - 1;

	memcpy(&msg[4], send, send_bytes);

	msg_bytes = send_bytes + 4;

	for (;;) {

	for (retry = 0; retry < 7; retry++) {

		ret = intel_dp_aux_ch(intel_dp, msg, msg_bytes, &ack, 1);

		if (ret < 0)

			return ret;

		ack >>= 4;

		if ((ack & DP_AUX_NATIVE_REPLY_MASK) == DP_AUX_NATIVE_REPLY_ACK)

			break;

			return send_bytes;

		else if ((ack & DP_AUX_NATIVE_REPLY_MASK) == DP_AUX_NATIVE_REPLY_DEFER)

			udelay(100);

			usleep_range(400, 500);

		else

			return -EIO;

	}

	return send_bytes;



	DRM_ERROR("too many retries, giving up\n");

	return -EIO;

}



/* Write a single byte to the aux channel in native mode */
@@ -582,6 +585,7 @@ intel_dp_aux_native_read(struct intel_dp *intel_dp, 
	int reply_bytes;

	uint8_t ack;

	int ret;

	int retry;



	if (WARN_ON(recv_bytes > 19))

		return -E2BIG;
@@ -595,7 +599,7 @@ intel_dp_aux_native_read(struct intel_dp *intel_dp, 
	msg_bytes = 4;

	reply_bytes = recv_bytes + 1;



	for (;;) {

	for (retry = 0; retry < 7; retry++) {

		ret = intel_dp_aux_ch(intel_dp, msg, msg_bytes,

				      reply, reply_bytes);

		if (ret == 0)
@@ -608,10 +612,13 @@ intel_dp_aux_native_read(struct intel_dp *intel_dp, 
			return ret - 1;

		}

		else if ((ack & DP_AUX_NATIVE_REPLY_MASK) == DP_AUX_NATIVE_REPLY_DEFER)

			udelay(100);

			usleep_range(400, 500);

		else

			return -EIO;

	}



	DRM_ERROR("too many retries, giving up\n");

	return -EIO;

}



static int

drivers/gpu/drm/i915/intel_ringbuffer.c

+21 −0
Original line number Diff line number Diff line
@@ -1653,6 +1653,27 @@ int intel_ring_begin(struct intel_ring_buffer *ring, 
	return 0;

}



/* Align the ring tail to a cacheline boundary */

int intel_ring_cacheline_align(struct intel_ring_buffer *ring)

{

	int num_dwords = (64 - (ring->tail & 63)) / sizeof(uint32_t);

	int ret;



	if (num_dwords == 0)

		return 0;



	ret = intel_ring_begin(ring, num_dwords);

	if (ret)

		return ret;



	while (num_dwords--)

		intel_ring_emit(ring, MI_NOOP);



	intel_ring_advance(ring);



	return 0;

}



void intel_ring_init_seqno(struct intel_ring_buffer *ring, u32 seqno)

{

	struct drm_i915_private *dev_priv = ring->dev->dev_private;

CRA Git | Maintained and supported by SUSTech CRA and CCSE