Linus Torvalds 4ff63e47f7 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux ... Pull drm fixes from Dave Airlie: "Intel: edid fixes, power consumption fix, s/r fix, haswell fix Radeon: BIOS loading fixes for UEFI and Thunderbolt machines, better MSAA validation, lockup timeout fixes, modesetting fixes One udl dpms fix, one vmwgfx fix, a couple of trivial core changes. There is an export added to ACPI as part of the radeon bios fixes. I've also included the fbcon flashing cursor vs deinit race fix, that seems the simplest place to start" Trivial conflict in drivers/video/console/fbcon.c due to me having already applied the fbcon flashing cursor vs deinit race fix, and Dave had added a comment in there too. * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (22 commits) fbcon: fix race condition between console lock and cursor timer (v1.1) drm: Add missing static storage class specifiers in drm_proc.c file drm/udl: dpms off the crtc when disabled. drm: Remove two unused fields from struct drm_display_mode drm: stop vmgfx driver explosion drm/radeon/ss: use num_crtc rather than hardcoded 6 Revert "drm/radeon: fix bo creation retry path" drm/i915: use hsw rps tuning values everywhere on gen6+ drm/radeon: split ATRM support out from the ATPX handler (v3) drm/radeon: convert radeon vfct code to use acpi_get_table_with_size ACPI: export symbol acpi_get_table_with_size drm/radeon: implement ACPI VFCT vbios fetch (v3) drm/radeon/kms: extend the Fujitsu D3003-S2 board connector quirk to cover later silicon stepping drm/radeon: fix checking of MSAA renderbuffers on r600-r700 drm/radeon: allow CMASK and FMASK in the CS checker on r600-r700 drm/radeon: init lockup timeout on ring init drm/radeon: avoid turning off spread spectrum for used pll drm/i915: fall back to bit-banging if GMBUS fails in CRT EDID reads drm/i915: extract connector update from intel_ddc_get_modes() for reuse drm/i915: fix hsw uncached pte ...		2012-08-22 10:45:13 -07:00
..
Kconfig	gpu/mfd/usb: Fix USB randconfig problems	2012-08-20 11:52:41 -07:00
Makefile
udl_connector.c
udl_drv.c	drm/udl: only bind to the video devices on the hub.	2012-06-16 11:09:58 +01:00
udl_drv.h	udl: add prime fd->handle support.	2012-05-23 10:46:05 +01:00
udl_encoder.c	drm: Make the .mode_fixup() operations mode argument a const pointer	2012-07-19 21:52:38 -04:00
udl_fb.c	udl: support vmapping imported dma-bufs	2012-05-31 14:13:59 +01:00
udl_gem.c	drm/udl: Use ERR_CAST inlined function instead of ERR_PTR(PTR_ERR(.. [1]	2012-08-09 09:58:44 +10:00
udl_main.c	drm/udl: Make sure to get correct endian keys from vendor descriptor	2012-06-25 07:43:12 +01:00
udl_modeset.c	drm/udl: dpms off the crtc when disabled.	2012-08-22 09:27:47 +10:00
udl_transfer.c