Message ID | 20200108120450.33ec0fdd@canb.auug.org.au (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | linux-next: manual merge of the drm tree with the drm-intel-fixes tree | expand |
Hi all, On Wed, 8 Jan 2020 12:04:50 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > - hw_flags = 0; > + /* For resource streamer on HSW+ and power context elsewhere */ > + BUILD_BUG_ON(HSW_MI_RS_SAVE_STATE_EN != MI_SAVE_EXT_STATE_EN); > + BUILD_BUG_ON(HSW_MI_RS_RESTORE_STATE_EN != MI_RESTORE_EXT_STATE_EN); > + > + flags = MI_SAVE_EXT_STATE_EN | MI_MM_SPACE_GTT; > - if (!i915_gem_context_is_kernel(rq->gem_context)) > + if (!test_bit(CONTEXT_VALID_BIT, &ce->flags)) I see from the drm-intel tree that this should have not have the '!'. I have fixed up my resolution for tomorrow (and it has been fixed for today's linux-next in the merge of the drm-intel tree.
diff --cc drivers/gpu/drm/i915/gt/intel_ring_submission.c index 93026217c121,81f872f9ef03..000000000000 --- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c