By the request of Ken, and Chris, I've added support for HW contexts to Ironlake. This is not the first time I've done this, but I think I'll skip the somewhat ugly history on the matter. Our existing support for Ironlake sets up 2 contexts, the powerctx, and the renderctx. The former is stored in special memory on GEN6+, and the latter is *extremely* similar to the way we use default context on GEN6+ (ie. if users don't opt in to contexts, they are using it even if they don't realize). The patch series first tries to tie that renderctx into our existing i915 context code, and then rips out the old renderctx. Powerctx is left alone since it still really is a special case. Finally, in the series I reenable rc6 on ILK. I've never had an issue with this on my ILK, but I recommend anyone testing on it who sees issues to try to disable it via modparam firstly. The patch series is minimally tested. I told Chris and Ken at the offset, they'd need to do the heavy lifting on the testing front. Ben Widawsky (9): drm/i915: move ilk rc6 context setup drm/i915: Convert renderctx to a regular context drm/i915: Make ILK context objects more like others drm/i915: Add gen5 support to mi_set_context drm/i915: Use do_switch for ILK renderctx drm/i915: HW contexts for ILK drm/i915: Use only the default context for ILK drm/i915: Restore ILK powerctx pin attributes drm/i915: Re-enable rc6 on ILK (again^5) drivers/gpu/drm/i915/i915_debugfs.c | 6 ---- drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/i915_gem_context.c | 28 ++++++++++++++--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 56 --------------------------------- 5 files changed, 25 insertions(+), 69 deletions(-) -- 1.8.3.2