Messages in this thread | | | Date | Wed, 8 Jan 2020 13:28:14 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree |
| |
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.
-- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |