Dave Airlie bdcddf95e8 Backmerge v4.1-rc4 into into drm-next ...

We picked up a silent conflict in amdkfd with drm-fixes and drm-next,
backmerge v4.1-rc5 and fix the conflicts

Signed-off-by: Dave Airlie <airlied@redhat.com>

Conflicts:
	drivers/gpu/drm/drm_irq.c

2015-05-20 16:23:53 +10:00

..

bridge

drm: bridge/dw_hdmi: separate VLEVCTRL settting into platform driver

2015-04-01 10:54:13 +01:00

i2c

drm/i2c: tda998x: add video and audio input configuration

2013-08-19 09:10:32 +10:00

ttm

drm/ttm: device address space != CPU address space

2015-03-05 09:04:39 +10:00

ati_pcigart.h

drm: Move legacy buffer structures to <drm/drm_legacy.h>

2014-09-12 15:28:12 +02:00

drm_agpsupport.h

drm: move remaining includes in drmP.h to the top

2014-09-10 17:42:03 +10:00

drm_atomic_helper.h

drm/atomic-helpers: Export drm_atomic_helper_update_legacy_modeset_state

2015-05-13 11:28:21 +02:00

drm_atomic.h

drm/atomic: Allow drivers to subclass drm_atomic_state, v3

2015-05-18 16:39:41 +02:00

drm_cache.h

…

drm_core.h

drm: Fix support for PCI domains

2010-08-10 08:20:20 +10:00

drm_crtc_helper.h

drm: make crtc/encoder/connector/plane helper_private a const pointer

2015-04-13 15:00:13 +02:00

drm_crtc.h

Merge tag 'topic/drm-misc-2015-05-19' of git://anongit.freedesktop.org/drm-intel into drm-next

2015-05-20 09:19:58 +10:00

drm_displayid.h

drm/displayid: add displayid defines and edid extension (v2)

2014-12-09 09:56:46 +10:00

drm_dp_helper.h

drm/dp: Fix comment in DP helper

2015-05-18 08:46:11 +02:00

drm_dp_mst_helper.h

drm/dp_mst: add a function to retrieve vcpi slots

2015-03-19 12:26:45 -04:00

drm_edid.h

drm/edid: add #defines for ELD versions

2015-04-13 14:59:58 +02:00

drm_encoder_slave.h

drm: i2c encoder helper wrappers

2013-02-17 17:55:42 -05:00

drm_fb_cma_helper.h

drm: Make drm_fb_cma_describe() static

2013-08-21 12:47:41 +10:00

drm_fb_helper.h

drm/fb: document drm_fb_helper_surface_size

2015-03-11 22:07:33 +01:00

drm_fixed.h

drm: fix 64 bit drm fixed point helpers

2013-07-30 17:24:13 -04:00

drm_flip_work.h

drm: flip-work: change drm_flip_work_init prototype

2014-11-15 09:29:14 +10:00

drm_gem_cma_helper.h

drm/cma: Introduce drm_gem_cma_dumb_create_internal()

2014-11-13 13:27:17 +01:00

drm_gem.h

drm: Use kref_put_mutex in drm_gem_object_unreference_unlocked

2015-04-07 18:11:25 +02:00

drm_global.h

drm: move ttm global code to core drm

2010-08-04 09:46:06 +10:00

drm_hashtab.h

drm: Add a hash-tab rcu-safe API

2012-11-28 18:36:05 +10:00

drm_legacy.h

drm: move drm_mmap to <drm/drm_legacy.h>

2014-09-24 11:43:07 +10:00

drm_mem_util.h

introduce SIZE_MAX

2012-05-31 17:49:26 -07:00

drm_mipi_dsi.h

drm/dsi: Do not require .owner field to be set

2014-11-13 13:56:17 +01:00

drm_mm.h

drm/mm: Support 4 GiB and larger ranges

2015-03-05 09:01:37 +10:00

drm_modes.h

drm: Fix the CRTC_STEREO_DOUBLE_ONLY define to include stero modes

2015-02-23 11:19:35 +01:00

drm_modeset_lock.h

drm: Per-plane locking

2014-11-12 17:56:12 +10:00

drm_of.h

drm: add of_graph endpoint helper to find possible CRTCs

2014-07-11 15:38:28 +01:00

drm_os_linux.h

drm: Kill DRM_SUSER

2013-12-18 11:35:45 +10:00

drm_panel.h

drm/panel: Add display timing support

2015-04-02 19:04:12 +02:00

drm_pciids.h

drm/radeon: add new bonaire pci id

2015-05-12 13:42:46 -04:00

drm_plane_helper.h

drm: make crtc/encoder/connector/plane helper_private a const pointer

2015-04-13 15:00:13 +02:00

drm_rect.h

drm: Add drm_rect rotation functions

2014-07-11 23:44:12 +02:00

drm_sysfs.h

…

drm_vma_manager.h

drm: init TTM dev_mapping in ttm_bo_device_init()

2014-03-16 12:23:42 +01:00

drmP.h

drm: simplify authentication management

2015-05-05 09:45:57 +02:00

exynos_drm.h

drm/exynos: fimd: replace struct fb_videomode with videomode

2013-09-05 13:43:44 +09:00

gma_drm.h

drm/gma500: Remove unused ioctls

2014-03-17 20:11:57 +01:00

i915_component.h

drm/i915: add component support

2015-01-12 02:48:20 +01:00

i915_drm.h

x86/gpu: Add Intel graphics stolen memory quirk for gen2 platforms

2014-02-09 15:11:30 +01:00

i915_pciids.h

drm/i915/bxt: Add BXT PCI ids

2015-04-09 15:57:45 +02:00

intel-gtt.h

drm/i915: Fix gen2 mappable calculations

2013-02-15 10:30:38 +01:00