On Tue, Apr 23, 2013 at 11:15:37PM -0700, Ben Widawsky wrote: > - i915_gem_context_init(dev); > + if (!dev_priv->hw_contexts_disabled && > + i915_gem_context_enable(dev_priv)) { Move the hw_contexts_disabled test into i915_gem_context_enable(), just makes this bit of code cleaner and less incestrous. -Chris -- Chris Wilson, Intel Open Source Technology Centre