diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-06-20 13:28:21 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-06-20 13:28:21 +0300 |
| commit | 902b31941327a0e9c0ca9eb7750414ae41bf8a89 (patch) | |
| tree | 300f4226c87e6df403cda861ab6766b23d278f09 /drivers/gpu/drm/i915/intel_lrc.c | |
| parent | c5ae366e12b2bd56fc7d7e9d484836bec9ddc110 (diff) | |
| parent | 2055da97389a605c8a00d163d40903afbe413921 (diff) | |
| download | linux-902b31941327a0e9c0ca9eb7750414ae41bf8a89.tar.xz | |
Merge branch 'WIP.sched/core' into sched/core
Conflicts:
kernel/sched/Makefile
Pick up the waitqueue related renames - it didn't get much feedback,
so it appears to be uncontroversial. Famous last words? ;-)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lrc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lrc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index c8f7c631fc1f..dac4e003c1f3 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -1989,7 +1989,7 @@ static int execlists_context_deferred_alloc(struct i915_gem_context *ctx, ce->ring = ring; ce->state = vma; - ce->initialised = engine->init_context == NULL; + ce->initialised |= engine->init_context == NULL; return 0; |