From: Dave Airlie Date: Thu, 23 Aug 2012 05:12:44 +0000 (+1000) Subject: Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into... X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=269b62db0e52bf2656aa762d61cfe67f3705fdff;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into drm-next Daniel writes: " First -next pull for 3.7. Highlights: - hsw hdmi improvements (Paulo) - ips/rps locking rework and cleanups - rc6 on ilk by default again - hw context&dp&dpff support for hsw (Ben) - GET_PARAM_HAS_SEMAPHORES (Chris) - gen6+ pipe_control improvements (Chris) - set_cacheing ioctl and assorted support code (Chris) - cleanups around the busy/idle/pm code (Chris&me) - flushing_list removal, hopefully for good (Chris) - read_reg ioctl (Ben) - support the ns2501 dvo (Thomas Richter) - avoid the costly gen6+ "missed IRQ" workaround where we don't need a race-free seqno readback (Chris) - various bits&pieces, mostly early patches from the modeset rework branch" * 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel: (54 commits) drm/i915: don't grab dev->struct_mutex for userspace forcewak drm/i915: try harder to find WR PLL clock settings drm/i915: use the correct encoder type when comparing drm/i915: Lazily apply the SNB+ seqno w/a drm/i915: enable rc6 on ilk again drm/i915: fix up ilk drps/ips locking drm/i915: DE_PCU_EVENT irq is ilk-only drm/i915: kill dev_priv->mchdev_lock drm/i915: move all rps state into dev_priv->rps drm/i915: use mutex_lock_interruptible for debugfs files drm/i915: fixup up debugfs rps state handling drm/i915: properly guard ilk ips state drm/i915: add parentheses around PIXCLK_GATE definitions drm/i915: reindent Haswell register definitions drm/i915: completely reset the value of DDI_FUNC_CTL drm/i915: correctly set the DDI_FUNC_CTL bpc field drm/i915: set the DDI sync polarity bits drm/i915: fix pipe DDI mode select drm/i915: dump the device info drm/i915: fixup desired rps frequency computation ... --- 269b62db0e52bf2656aa762d61cfe67f3705fdff