From: Dave Airlie <airlied@redhat.com>
Date: Thu, 23 Jul 2020 22:28:09 +0000 (+1000)
Subject: Merge v5.8-rc6 into drm-next
X-Git-Tag: v5.9-rc1~134^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=41206a073ceebc517245677a19f52ba6379b33a9;p=thirdparty%2Fkernel%2Flinux.git

Merge v5.8-rc6 into drm-next

I've got a silent conflict + two trees based on fixes to merge.

Fixes a silent merge with amdgpu

Signed-off-by: Dave Airlie <airlied@redhat.com>
---

41206a073ceebc517245677a19f52ba6379b33a9
diff --cc drivers/gpu/drm/i915/gvt/handlers.c
index 26cae4846c827,fadd2adb80307..78ba2857144e0
--- a/drivers/gpu/drm/i915/gvt/handlers.c
+++ b/drivers/gpu/drm/i915/gvt/handlers.c
@@@ -1734,9 -1731,8 +1734,9 @@@ static int ring_mode_mmio_write(struct 
  		return 0;
  	}
  
 -	if (IS_COFFEELAKE(vgpu->gvt->gt->i915) &&
 +	if ((IS_COFFEELAKE(vgpu->gvt->gt->i915) ||
 +	     IS_COMETLAKE(vgpu->gvt->gt->i915)) &&
- 	    data & _MASKED_BIT_ENABLE(2)) {
+ 	    IS_MASKED_BITS_ENABLED(data, 2)) {
  		enter_failsafe_mode(vgpu, GVT_FAILSAFE_UNSUPPORTED_GUEST);
  		return 0;
  	}
diff --cc drivers/gpu/drm/i915/i915_vma.c
index 7fe1f317cd2bc,1f9cd33b35cb3..8dde2415a0ef7
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@@ -196,17 -196,12 +196,19 @@@ vma_create(struct drm_i915_gem_object *
  		 * and dispose of ours.
  		 */
  		cmp = i915_vma_compare(pos, vm, view);
 +		if (cmp == 0) {
 +			spin_unlock(&obj->vma.lock);
 +			i915_vm_put(vm);
 +			i915_vma_free(vma);
 +			return pos;
 +		}
 +
  		if (cmp < 0)
  			p = &rb->rb_right;
- 		else
+ 		else if (cmp > 0)
  			p = &rb->rb_left;
+ 		else
+ 			goto err_unlock;
  	}
  	rb_link_node(&vma->obj_node, rb, p);
  	rb_insert_color(&vma->obj_node, &obj->vma.tree);