From: Dave Airlie Date: Tue, 13 Mar 2012 10:16:06 +0000 (+0000) Subject: Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux... X-Git-Tag: v3.4-rc1~141^2~62 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=abd32008ff0b21eabf0074df47189047adbca37a;p=profile%2Fivi%2Fkernel-x86-ivi.git Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-core-next * 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (57 commits) drm/nouveau: map first page of mmio early and determine chipset earlier drm/nvd0/disp: disconnect encoders before reprogramming them drm/nvd0/disp: move syncs/magic setup to or mode_set drm/nouveau/dp: account for channel coding overhead in link training drm/nvd0/disp: fix dcb sor link matching in supervisor handler drm/nvd0/disp: initial implementation of displayport drm/nouveau/dp: make dp dpms function common, call from sor code instead drm/nv50/hwsq: some nv92 fixes drm/nouveau/dp: move all nv50/sor-specific code out of nouveau_dp.c drm/nouveau/dp: make functions for executing various bios tables drm/nouveau/pm: fix oops if chipset has no pm support at all drm/nouveau/bios: rework vbios shadowing drm/nouveau/bios: attempt acpi rom fetch before pcirom drm/nvd0/disp: attempt to handle more than 2 crtcs if possible drm/nvc0/vram: get part count from PUNITS drm/nv40/pm: fix fanspeed regression drm/nouveau/pm: several fixes for nvc0 memory timings drm/nvc0/pm: restrict pll mode to clocks that can actually use it drm/nouveau/dp: fix bad comparison in dp_link_train_commit() drm/nouveau/mxm: call mxmi to determine revision before calling mxms ... --- abd32008ff0b21eabf0074df47189047adbca37a