[git pull] drm merge for 3.3-rc1.
Hi Linus, This is the main pull request for the drm for this merge window. It has two conflicts with your tree, I've fixed them up in a separate drm-linus-merged branch if you don't want to exercise your merging fingers. Highlights: drm core: add plane support and userspace interface to expose overlays for intel and soc hardwre. Lots of code removal through restructing by Daniel Vetter. EDID support for CEA modes. ttm: DMA aware page pool added, allows for use under Xen, and makes support for radeon VM easier. radeon: multi-ring support, semaphore support, better IB pool support, add VM support for Cayman and upcoming GPUs, evergreen HDMI audio support gma500: Initial GMA500 KMS driver moved from staging into drm proper. nouveau: HDMI audio support, lots of power management fixes, overscan connector property, initial nvd9 support, exynos: hdmi support, pm support, plane support. intel: better HDMI ELD support, plane support, GEN 7 streamout support. The Intel guys are also having process issues again, and then Intel pull request was very late and it looked like nobody was pulling stuff into a -next tree at all regularly. I'm sort of tempted to just drop anything more from them for this cycle, to give them time to sort themselves out for the next one. I think there is one missed IRQ fix from them I'd like to see, the rest I'm thinking can wait. Dave. The following changes since commit 6abff3c78051e40130a1c653f874fb12b9d40254: vmwgfx: Clip cliprects against screen boundaries in present and dirty (2011-12-19 14:06:05 +) are available in the git repository at: git://people.freedesktop.org/~airlied/linux drm-core-next Akshay Joshi (1): gma500: Convert spaces to tabs in accel_2d.c. Alan Cox (31): gma500: Move the basic driver out of staging gma500: GEM and GEM glue gma500: introduce the GTT and MMU handling logic gma500: introduce the framebuffer support code gma500: Add device framework gma500: Add the glue to the various BIOS and firmware interfaces gma500: Add the i2c bus support gma500: Add the core DRM files and headers gma500: Add Poulsbo support gma500: Add Oaktrail support gma500: Add support for Cedarview gma500: Now connect up to the DRM build to finish the job drm/gma500: begin pruning dead bits of API gma500: Rename the ioctls to avoid clashing with the legacy drivers gma500: kill off NUM_PIPE define gma500: Move the API gma500: kill virtual mapping support gma500: do a pass over the FIXME tags gma500: kill bogus code gma500: Fix backlight crash gma500: frame buffer locking gma500: gtt based hardware scrolling console gma500: Be smarter about layout gma500: Fix oaktrail probing part 1 gma500: Oaktrail BIOS handling gma500: Final enables for Oaktrail gma500: Oaktrail fixes gma500/oaktrail: panel display quality fix gma500: Add the E6xx PCI identifier we are missing gma500: Fix Cedarview support (Correct version) gma500: remove no_fb bits Alex Deucher (9): drm/radeon/kms: add support for multiple fence queues v2 drm/radeon/kms: add some new ring params to better handle other ring types drm/radeon/kms: add cayman specific fence_ring_emit drm/radeon/kms: add support for per-ring fence interrupts drm/radeon/kms: add missing ring ready check in sync tests drm/radeon/kms: disable writeback on pre-R300 asics drm/radeon/kms: sync across multiple rings when doing bo moves v3 drm/radeon/kms: check if vm is supported in VA ioctl drm/radeon/kms: remove pointless CS flags priority struct Arjan van de Ven (1): drm: Make the per-driver file_operations struct const Ben Skeggs (88): drm/nv40/pm: parse fan pwm divisor from vbios tables drm/nv40/pm: implement first type of pwm fanspeed funcs drm/nv41/pm: implement a second type of fanspeed pwm drm/nouveau/pm: hook up fanspeed get/set if they're present drm/nouveau/vdec: implement stub modules for the known engines drm/nv50/pm: add support for pwm fan control drm/nv50/pm: mostly nailed down fan pwm frequency selection drm/nouveau/gpio: remove invert flag, use state[] everywhere drm/nouveau/pm: introduce generic handler for on-chip fan controller drm/nv50/pm: convert to new fanspeed pwm controller hooks drm/nv40/pm: convert to new pwm hooks, also fixing pwm type detection drm/nouveau/pm: remove defunct fanspeed_set/get from pm table drm/nv50/pm: s/unk05/vdec/ drm/nouveau/hdmi: build ELD from EDID, notify audio driver of its presence drm/nouveau/hdmi: add hdmi register accessors to handle hdmi block move drm/nouveau/hdmi: enable sending of avi/audio infoframes drm/nv50/crtc: disable flip overlay around scaling mode changes drm/nouveau: move master modesetting init to nouveau_display
[git pull] drm merge for 3.3-rc1.
Hi Linus, This is the main pull request for the drm for this merge window. It has two conflicts with your tree, I've fixed them up in a separate drm-linus-merged branch if you don't want to exercise your merging fingers. Highlights: drm core: add plane support and userspace interface to expose overlays for intel and soc hardwre. Lots of code removal through restructing by Daniel Vetter. EDID support for CEA modes. ttm: DMA aware page pool added, allows for use under Xen, and makes support for radeon VM easier. radeon: multi-ring support, semaphore support, better IB pool support, add VM support for Cayman and upcoming GPUs, evergreen HDMI audio support gma500: Initial GMA500 KMS driver moved from staging into drm proper. nouveau: HDMI audio support, lots of power management fixes, overscan connector property, initial nvd9 support, exynos: hdmi support, pm support, plane support. intel: better HDMI ELD support, plane support, GEN 7 streamout support. The Intel guys are also having process issues again, and then Intel pull request was very late and it looked like nobody was pulling stuff into a -next tree at all regularly. I'm sort of tempted to just drop anything more from them for this cycle, to give them time to sort themselves out for the next one. I think there is one missed IRQ fix from them I'd like to see, the rest I'm thinking can wait. Dave. The following changes since commit 6abff3c78051e40130a1c653f874fb12b9d40254: vmwgfx: Clip cliprects against screen boundaries in present and dirty (2011-12-19 14:06:05 +) are available in the git repository at: git://people.freedesktop.org/~airlied/linux drm-core-next Akshay Joshi (1): gma500: Convert spaces to tabs in accel_2d.c. Alan Cox (31): gma500: Move the basic driver out of staging gma500: GEM and GEM glue gma500: introduce the GTT and MMU handling logic gma500: introduce the framebuffer support code gma500: Add device framework gma500: Add the glue to the various BIOS and firmware interfaces gma500: Add the i2c bus support gma500: Add the core DRM files and headers gma500: Add Poulsbo support gma500: Add Oaktrail support gma500: Add support for Cedarview gma500: Now connect up to the DRM build to finish the job drm/gma500: begin pruning dead bits of API gma500: Rename the ioctls to avoid clashing with the legacy drivers gma500: kill off NUM_PIPE define gma500: Move the API gma500: kill virtual mapping support gma500: do a pass over the FIXME tags gma500: kill bogus code gma500: Fix backlight crash gma500: frame buffer locking gma500: gtt based hardware scrolling console gma500: Be smarter about layout gma500: Fix oaktrail probing part 1 gma500: Oaktrail BIOS handling gma500: Final enables for Oaktrail gma500: Oaktrail fixes gma500/oaktrail: panel display quality fix gma500: Add the E6xx PCI identifier we are missing gma500: Fix Cedarview support (Correct version) gma500: remove no_fb bits Alex Deucher (9): drm/radeon/kms: add support for multiple fence queues v2 drm/radeon/kms: add some new ring params to better handle other ring types drm/radeon/kms: add cayman specific fence_ring_emit drm/radeon/kms: add support for per-ring fence interrupts drm/radeon/kms: add missing ring ready check in sync tests drm/radeon/kms: disable writeback on pre-R300 asics drm/radeon/kms: sync across multiple rings when doing bo moves v3 drm/radeon/kms: check if vm is supported in VA ioctl drm/radeon/kms: remove pointless CS flags priority struct Arjan van de Ven (1): drm: Make the per-driver file_operations struct const Ben Skeggs (88): drm/nv40/pm: parse fan pwm divisor from vbios tables drm/nv40/pm: implement first type of pwm fanspeed funcs drm/nv41/pm: implement a second type of fanspeed pwm drm/nouveau/pm: hook up fanspeed get/set if they're present drm/nouveau/vdec: implement stub modules for the known engines drm/nv50/pm: add support for pwm fan control drm/nv50/pm: mostly nailed down fan pwm frequency selection drm/nouveau/gpio: remove invert flag, use state[] everywhere drm/nouveau/pm: introduce generic handler for on-chip fan controller drm/nv50/pm: convert to new fanspeed pwm controller hooks drm/nv40/pm: convert to new pwm hooks, also fixing pwm type detection drm/nouveau/pm: remove defunct fanspeed_set/get from pm table drm/nv50/pm: s/unk05/vdec/ drm/nouveau/hdmi: build ELD from EDID, notify audio driver of its presence drm/nouveau/hdmi: add hdmi register accessors to handle hdmi block move drm/nouveau/hdmi: enable sending of avi/audio infoframes drm/nv50/crtc: disable flip overlay around scaling mode changes drm/nouveau: move master modesetting init to nouveau_display
