From: Daniel Vetter Date: Fri, 10 Feb 2012 15:52:55 +0000 (+0100) Subject: Merge remote-tracking branch 'airlied/drm-fixes' into drm-intel-next-queued X-Git-Tag: firefly_0821_release~3680^2~2315^2~115^2~145 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9edd576d89a5b6d3e136d7dcab654d887c0d25b7;p=firefly-linux-kernel-4.4.55.git Merge remote-tracking branch 'airlied/drm-fixes' into drm-intel-next-queued Back-merge from drm-fixes into drm-intel-next to sort out two things: - interlaced support: -fixes contains a bugfix to correctly clear interlaced configuration bits in case the bios sets up an interlaced mode and we want to set up the progressive mode (current kernels don't support interlaced). The actual feature work to support interlaced depends upon (and conflicts with) this bugfix. - forcewake voodoo to workaround missed IRQ issues: -fixes only enabled this for ivybridge, but some recent bug reports indicate that we need this on Sandybridge, too. But in a slightly different flavour and with other fixes and reworks on top. Additionally there are some forcewake cleanup patches heading to -next that would conflict with currrent -fixes. Signed-Off-by: Daniel Vetter --- 9edd576d89a5b6d3e136d7dcab654d887c0d25b7