[PATCH] mismatch

[Tvrtko Ursulin]

From: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
---
 drivers/gpu/drm/i915/gt/intel_lrc.c | 4 ++++
 drivers/gpu/drm/i915/i915_vma.c     | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
index 39b0125b7143..ada911f64ce1 100644
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -3835,6 +3835,8 @@ static int gen8_emit_bb_start_noarb(struct i915_request *rq,
 {
 	u32 *cs;
 
+	GEM_BUG_ON((flags & I915_DISPATCH_SECURE) && !rq->context->vm->is_ggtt);
+
 	cs = intel_ring_begin(rq, 4);
 	if (IS_ERR(cs))
 		return PTR_ERR(cs);
@@ -3871,6 +3873,8 @@ static int gen8_emit_bb_start(struct i915_request *rq,
 {
 	u32 *cs;
 
+	GEM_BUG_ON((flags & I915_DISPATCH_SECURE) && !rq->context->vm->is_ggtt);
+
 	cs = intel_ring_begin(rq, 6);
 	if (IS_ERR(cs))
 		return PTR_ERR(cs);
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index 298ca4316e65..96ba36570067 100644
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -895,6 +895,8 @@ int i915_vma_pin(struct i915_vma *vma, u64 size, u64 alignment, u64 flags)
 	GEM_BUG_ON(flags & PIN_UPDATE);
 	GEM_BUG_ON(!(flags & (PIN_USER | PIN_GLOBAL)));
 
+	GEM_BUG_ON((flags & PIN_GLOBAL) && !vma->vm->is_ggtt);
+
 	/* First try and grab the pin without rebinding the vma */
 	if (try_qad_pin(vma, flags & I915_VMA_BIND_MASK))
 		return 0;
-- 
2.20.1