From: Dave Airlie Date: Thu, 13 Sep 2012 01:07:31 +0000 (+1000) Subject: Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel... X-Git-Tag: firefly_0821_release~3680^2~2091^2~5 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6426a7b0d9e9756f09fad52a1200525d62fb8396;p=firefly-linux-kernel-4.4.55.git Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes Daniel writes: "Nothing really major at all: - fixup edp setup sequence (Dave) - disable sdvo hotplug for real, this is a fixup for a messed-up regression fixer (Jani) - don't expose dysfunctional backlight driver (Jani) - properly init spinlock (only used by hsw/vlv code) from Alexander Shishkin" along with a couple of more fixes on top. * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel: drm/i915: fix up the IBX transcoder B check drm/i915: set the right gen3 flip_done mode also at resume drm/i915: initialize dpio_lock spin lock drm/i915: do not expose a dysfunctional backlight interface to userspace drm/i915: only enable sdvo hotplug irq if needed drm/i915/edp: get the panel delay before powering up --- 6426a7b0d9e9756f09fad52a1200525d62fb8396