Hi all, Essentially just rebase, with Ben's review comments taking into account and one WARN_ON(mutex_is_locked) moved around a bit. Review&testing highly welcome. Cheers, Daniel Daniel Vetter (8): drm/i915: properly guard ilk ips state drm/i915: fixup up debugfs rps state handling drm/i915: move all rps state into dev_priv->rps drm/i915: kill dev_priv->mchdev_lock drm/i915: DE_PCU_EVENT irq is ilk-only drm/i915: fix up ilk drps/ips locking drm/ips: move drps/ips/ilk related variables into dev_priv->ips drm/i915: enable rc6 on ilk again drivers/gpu/drm/i915/i915_debugfs.c | 38 +++++- drivers/gpu/drm/i915/i915_dma.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 55 +++++--- drivers/gpu/drm/i915/i915_irq.c | 72 +++++----- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 248 ++++++++++++++++++---------------- 6 files changed, 245 insertions(+), 172 deletions(-) -- 1.7.10.4