From: Dave Airlie Date: Tue, 1 Jun 2010 01:32:29 +0000 (+1000) Subject: Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-testing X-Git-Tag: firefly_0821_release~9833^2~1599^2~13 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=36d1701c502d4f46386e1000ad58d9497a11688d;p=firefly-linux-kernel-4.4.55.git Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-testing * 'nouveau/for-airlied' of ../drm-nouveau-next: drm/nv50: cast IGP memory location to u64 before shifting drm/nv50: use alternate source of SOR_MODE_CTRL for DP hack drm/nouveau: fix dual-link displays when plugged into single-link outputs drm/nv50: obey dcb->duallink_possible drm/nv50: fix duallink_possible calculation for DCB 4.0 cards drm/nouveau: don't execute INIT_GPIO unless we're really running the table drm/nv40: allow cold-booting of nv4x chipsets drm/nouveau: fix POST detection for certain chipsets drm/nouveau: Add getparam for current PTIMER time. drm/nouveau: allow cursor image and position to survive suspend --- 36d1701c502d4f46386e1000ad58d9497a11688d