[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in:

  drivers/gpu/drm/i915/intel_ringbuffer.h

between commit:

  ee412ecc74c4 ("drm/i915: Snapshot seqno of most recently submitted request.")

from the drm-intel-fixes tree and commit:

  bccca494f75c ("drm/i915: Remove the now obsolete 'outstanding_lazy_request'")

from the drm-intel tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc drivers/gpu/drm/i915/intel_ringbuffer.h
index 4be66f60504d,0ea89ea30182..000000000000
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@@ -271,17 -292,6 +292,13 @@@ struct  intel_engine_cs 
  	 */
  	struct list_head request_list;
  
 +	/**
- 	 * Do we have some not yet emitted requests outstanding?
- 	 */
- 	struct drm_i915_gem_request *outstanding_lazy_request;
- 	/**
 +	 * Seqno of request most recently submitted to request_list.
 +	 * Used exclusively by hang checker to avoid grabbing lock while
 +	 * inspecting request list.
 +	 */
 +	u32 last_submitted_seqno;
 +
  	bool gpu_caches_dirty;
  
  	wait_queue_head_t irq_queue;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20150710/523b57a9/attachment.sig>