linux-next: manual merge of the drm tree with the drm-intel-fixes tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi Dave,

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

  drivers/gpu/drm/i915/gvt/cmd_parser.c

between commit:

  695fbc08d80f ("drm/i915/gvt: replace the gvt_err with gvt_vgpu_err")

from the drm-intel-fixes tree and commit:

  73dec95e6ba3 ("drm/i915: Emit to ringbuffer directly")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/gvt/cmd_parser.c
index 2b92cc8a7d1a,81076d8ec41a..000000000000
--- a/drivers/gpu/drm/i915/gvt/cmd_parser.c
+++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c
@@@ -1673,8 -1644,8 +1673,8 @@@ static int perform_bb_shadow(struct par
  	ret = copy_gma_to_hva(s->vgpu, s->vgpu->gtt.ggtt_mm,
  			      gma, gma + bb_size,
  			      dst);
- 	if (ret) {
+ 	if (ret < 0) {
 -		gvt_err("fail to copy guest ring buffer\n");
 +		gvt_vgpu_err("fail to copy guest ring buffer\n");
  		goto unmap_src;
  	}
  
@@@ -2668,26 -2633,23 +2665,24 @@@ static int shadow_workload_ring_buffer(
  	/* head > tail --> copy head <-> top */
  	if (gma_head > gma_tail) {
  		ret = copy_gma_to_hva(vgpu, vgpu->gtt.ggtt_mm,
- 				gma_head, gma_top,
- 				workload->shadow_ring_buffer_va);
- 		if (ret) {
+ 				      gma_head, gma_top, cs);
+ 		if (ret < 0) {
+ 			gvt_err("fail to copy guest ring buffer\n");
 +			gvt_vgpu_err("fail to copy guest ring buffer\n");
  			return ret;
  		}
- 		copy_len = gma_top - gma_head;
+ 		cs += ret / sizeof(u32);
  		gma_head = workload->rb_start;
  	}
  
  	/* copy head or start <-> tail */
- 	ret = copy_gma_to_hva(vgpu, vgpu->gtt.ggtt_mm,
- 			gma_head, gma_tail,
- 			workload->shadow_ring_buffer_va + copy_len);
- 	if (ret) {
+ 	ret = copy_gma_to_hva(vgpu, vgpu->gtt.ggtt_mm, gma_head, gma_tail, cs);
+ 	if (ret < 0) {
 -		gvt_err("fail to copy guest ring buffer\n");
 +		gvt_vgpu_err("fail to copy guest ring buffer\n");
  		return ret;
  	}
- 	ring->tail += workload->rb_len;
- 	intel_ring_advance(ring);
+ 	cs += ret / sizeof(u32);
+ 	intel_ring_advance(workload->req, cs);
  	return 0;
  }
  
@@@ -2743,8 -2703,8 +2738,8 @@@ static int shadow_indirect_ctx(struct i
  				wa_ctx->workload->vgpu->gtt.ggtt_mm,
  				guest_gma, guest_gma + ctx_size,
  				map);
- 	if (ret) {
+ 	if (ret < 0) {
 -		gvt_err("fail to copy guest indirect ctx\n");
 +		gvt_vgpu_err("fail to copy guest indirect ctx\n");
  		goto unmap_src;
  	}
  
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html