Daniel Vetter
767878908e
Linux 3.4-rc3 ...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
iQEbBAABAgAGBQJPi3XOAAoJEHm+PkMAQRiGnsUH9RjHwH4YFVyuP/DKtKa6zs74
wqkpT15yITQ5WWMog4JaJFFg5rJCUd8QZr7AS/HSn0ijDyZX5VU7Rcs9cMudDzNR
H/5K/AscS4fjb0HwWVqoltTWHRb9QGSwVN3+E3VCDLt9P89YJ0o3QztkkuEX5dkZ
jc7reVXTfRnCcILEa9jleOzrn+OLM3j/jAjQ2hGunl8EDLzD4b17HHPoli4jEZ/5
5ibpSVsPD+AqzN+glbXvYjVItl12D0IQos/JdOwfuZriCVWLxysSSwHZTbPCyvBZ
LHH4HR5T+XLSXbjJeNkUFHLzqU+d5gVRadIoWtJCxqxFjKbOs2YtzJ5Ai0nDiw==
=kTkC
-----END PGP SIGNATURE-----
Merge tag 'v3.4-rc3' into drm-intel-next-queued
Backmerge Linux 3.4-rc3 into drm-intel-next to resolve a few things
that conflict/depend upon patches in -rc3:
- Second part of the Sandybridge workaround series - it changes some
of the same registers.
- Preparation for Chris Wilson's fencing cleanup - we need the fix
from -rc3 merged before we can move around all that code.
- Resolve the gmbus conflict - gmbus has been disabled in 3.4 again,
but should be enabled on all generations in 3.5.
Conflicts:
drivers/gpu/drm/i915/intel_i2c.c
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-04-17 11:16:20 +02:00
drm: Import driver for the sil164 I2C TMDS transmitter.
2010-08-02 10:21:13 +10:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
drm: base prime/dma-buf support (v5)
2012-03-30 11:52:44 +01:00
drm: Add generic multipart buffer.
2010-02-23 09:46:20 +10:00
drm/ttm: consolidate cache flushing code in one place.
2009-08-27 09:53:47 +10:00
drm: Fix support for PCI domains
2010-08-10 08:20:20 +10:00
drm: allow loading an EDID as firmware to override broken monitor
2012-03-20 10:09:28 +00:00
drm: Add drm_format_num_planes() utility function
2011-12-20 20:34:32 +00:00
drm/radeon/kms: properly set panel mode for eDP
2011-11-01 16:01:58 +00:00
drm: allow loading an EDID as firmware to override broken monitor
2012-03-20 10:09:28 +00:00
drm/kms: no need to return void value (encoder)
2009-08-19 16:06:49 +10:00
drm fb helper: remove unused variable crtc_id
2012-02-03 09:55:52 +00:00
drm: move radeon_fixed.h to shared drm_fixed.h header
2010-05-18 18:21:33 +10:00
drm: Add multi buffer plane pixel formats
2011-12-29 11:21:42 +09:00
drm: move ttm global code to core drm
2010-08-04 09:46:06 +10:00
drm: Remove unused members from struct drm_open_hash
2011-02-23 11:16:40 +10:00
drm/ttm: use drm calloc large and free large
2010-03-15 10:31:43 +10:00
includecheck fix: include/drm, drm_memory.h
2009-09-20 16:02:58 +05:30
drm: mm: fix debug output
2011-05-09 09:14:45 +10:00
headers: include linux/types.h where appropriate
2012-03-23 16:58:31 -07:00
drm/i915: add i915_lp_ring_sync helper
2009-11-05 14:47:07 -08:00
drm/radeon/kms: add trinity pci ids
2012-03-21 06:55:58 +00:00
drm: move to kref per-master structures.
2008-12-29 17:47:22 +10:00
drm: Enable drm drivers to add drm sysfs devices.
2009-08-19 16:08:51 +10:00
drm: add usb framework
2011-02-07 13:09:42 +10:00
Merge branch 'drm-intel-next' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next
2012-04-12 10:27:01 +01:00
drm/exynos: fixed exynos broken ioctl
2012-04-12 16:42:54 +09:00
gma500: fix ioctl confict
2012-03-10 13:06:04 +00:00
drm/i915: add HAS_ALIASING_PPGTT parameter for userspace
2012-03-20 21:55:40 +01:00
drm/i915: disable ppgtt on snb when dmar is enabled
2012-04-02 15:59:07 +02:00
drm/exynos: exynos_drm.h header file fixes
2012-02-15 10:29:12 +09:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
drm/nv50: support for compression
2011-02-25 06:46:07 +10:00
drm/radeon/kms: add support for the CONST IB to the CS ioctl
2012-03-21 06:55:53 +00:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
drm/sis: track obj->drm_fd relations in the driver
2011-12-22 00:33:15 +01:00
drm/via: track obj->drm_fd relations in the driver
2011-12-22 00:33:19 +01:00
vmwgfx: Reinstate the update_layout ioctl
2011-11-02 08:30:31 +00:00
767878908e