Dave Airlie b3869b17fd Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next ...

This backmerges drm-fixes into drm-next mainly for the amdkfd
stuff, I'm not 100% confident, but it builds and the amdkfd
folks can fix anything up.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
	drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
	drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h

2015-01-29 11:45:31 +10:00

..

amd

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next

2015-01-29 11:45:31 +10:00

armada

Merge tag 'topic/core-stuff-2014-12-19' of git://anongit.freedesktop.org/drm-intel into drm-next

2015-01-09 09:13:41 +10:00

ast

drm/fb-helper: Propagate errors from initial config failure

2015-01-21 14:57:03 +01:00

atmel-hlcdc

drm: add Atmel HLCDC Display Controller support

2015-01-21 09:46:02 +01:00

bochs

drm/fb-helper: Propagate errors from initial config failure

2015-01-21 14:57:03 +01:00

bridge

drm/bridge: dw-hdmi: Adapt to bridge API change

2015-01-28 10:01:30 +01:00

cirrus

drm/fb-helper: Propagate errors from initial config failure

2015-01-21 14:57:03 +01:00

exynos

drm/exynos: dp: support drm_bridge

2015-01-28 08:47:29 +01:00

gma500

drm/fb-helper: Propagate errors from initial config failure

2015-01-21 14:57:03 +01:00

i2c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next

2015-01-29 11:45:31 +10:00

i810

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

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

i915

Merge tag 'drm-intel-next-2015-01-17' of git://anongit.freedesktop.org/drm-intel into drm-next

2015-01-27 09:01:09 +10:00

imx

imx-drm: core: handling of DI clock flags to ipu_crtc_mode_set()

2015-01-07 21:32:07 +01:00

mga

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

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

mgag200

drm/fb-helper: Propagate errors from initial config failure

2015-01-21 14:57:03 +01:00

msm

drm/bridge: make bridge registration independent of drm flow

2015-01-28 08:45:40 +01:00

nouveau

Merge tag 'topic/core-stuff-2015-01-23' of git://anongit.freedesktop.org/drm-intel into drm-next

2015-01-27 08:54:11 +10:00

omapdrm

drm/fb-helper: Propagate errors from initial config failure

2015-01-21 14:57:03 +01:00

panel

drm/panel: simple: Add AVIC TM070DDH03 panel support

2015-01-28 08:45:39 +01:00

qxl

drm/fb-helper: Propagate errors from initial config failure

2015-01-21 14:57:03 +01:00

r128

drm: remove unnecessary sizeof(u8)

2014-11-20 11:30:37 +10:00

radeon

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next

2015-01-29 11:45:31 +10:00

rcar-du

Merge branch 'drm/next/du' of git://linuxtv.org/pinchartl/fbdev into drm-next

2015-01-21 10:16:24 +10:00

rockchip

Merge branch 'drm-next' of https://github.com/markyzq/kernel-drm-rockchip into drm-next

2015-01-27 10:05:44 +10:00

savage

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

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

shmobile

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

2014-12-15 15:52:01 -08:00

sis

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

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

sti

drm/sti: fixup for bridge interface

2015-01-28 10:01:29 +01:00

tdfx

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

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

tegra

drm/tegra: Use correct relocation target offsets

2015-01-27 10:14:59 +01:00

tilcdc

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

2014-12-15 15:52:01 -08:00

ttm

drm/ttm: optionally move duplicates to a separate list

2014-12-03 18:26:52 -05:00

udl

drm/fb-helper: Propagate errors from initial config failure

2015-01-21 14:57:03 +01:00

via

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

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

vmwgfx

drm/vmwgfx: Replace the hw mutex with a hw spinlock

2015-01-19 03:02:13 -08:00

ati_pcigart.c

drm: split ati_pcigart.h out of drmP.h

2014-09-12 14:11:14 +10:00

drm_agpsupport.c

drm: move AGP definitions harder

2014-09-10 17:40:11 +10:00

drm_atomic_helper.c

Merge tag 'topic/atomic-core-2015-01-27' of git://anongit.freedesktop.org/drm-intel into drm-next

2015-01-28 09:34:27 +10:00

drm_atomic.c

Merge tag 'topic/atomic-core-2015-01-27' of git://anongit.freedesktop.org/drm-intel into drm-next

2015-01-28 09:34:27 +10:00

drm_auth.c

drm: Move piles of functions from drmP.h to drm_internal.h

2014-09-12 11:16:29 +02:00

drm_bridge.c

drm/bridge: make bridge registration independent of drm flow

2015-01-28 08:45:40 +01:00

drm_bufs.c

drm: Move __drm_pci_free to drm_legacy.h

2014-09-12 11:08:56 +02:00

drm_cache.c

drm/cache: Use wbinvd helpers

2014-12-16 08:56:55 +01:00

drm_context.c

drm: mark drm_context support as legacy

2014-08-05 19:38:12 +02:00

drm_crtc_helper.c

drm/atomic: Introduce state->obj backpointers

2014-12-17 20:23:23 +01:00

drm_crtc_internal.h

drm/atomic: Hide drm.ko internal interfaces

2015-01-05 13:55:30 +01:00

drm_crtc.c

drm: Check the right variable when setting formats

2015-01-28 08:58:37 +01:00

drm_debugfs.c

drm: Move piles of functions from drmP.h to drm_internal.h

2014-09-12 11:16:29 +02:00

drm_dma.c

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

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

drm_dp_helper.c

drm/dp: retry AUX transactions 32 times (v1.1)

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

drm_dp_mst_topology.c

drm/tile: expose the tile property to userspace (v3)

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

drm_drv.c

drm: add atomic properties

2015-01-05 13:54:38 +01:00

drm_edid_load.c

drm/edid: Deletion of an unnecessary check before the function call "release_firmware"

2014-11-21 12:16:27 +10:00

drm_edid.c

Merge tag 'topic/core-stuff-2014-12-10' of git://anongit.freedesktop.org/drm-intel into drm-next

2014-12-11 10:12:57 +10:00

drm_encoder_slave.c

…

drm_fb_cma_helper.c

drm: Introduce drm_fb_helper_prepare()

2014-07-08 11:31:28 +10:00

drm_fb_helper.c

Merge tag 'topic/core-stuff-2015-01-23' of git://anongit.freedesktop.org/drm-intel into drm-next

2015-01-27 08:54:11 +10:00

drm_flip_work.c

drm: flip-work: change drm_flip_work_init prototype

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

drm_fops.c

drm: Make drm_read() more robust against multithreaded races

2015-01-21 14:57:03 +01:00

drm_gem_cma_helper.c

drm/cma: Remove call to drm_gem_free_mmap_offset()

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

drm_gem.c

Merge tag 'drm/gem-cma/for-3.19-rc1' of git://people.freedesktop.org/~tagr/linux into drm-next

2014-11-15 09:50:21 +10:00

drm_global.c

…

drm_hashtab.c

list: fix order of arguments for hlist_add_after(_rcu)

2014-08-06 18:01:24 -07:00

drm_info.c

drm/info: Remove unused code

2014-12-16 18:44:34 +01:00

drm_internal.h

drm/info: Remove unused code

2014-12-16 18:44:34 +01:00

drm_ioc32.c

…

drm_ioctl.c

drm: Ensure universal_planes is set for atomic

2015-01-05 13:55:30 +01:00

drm_irq.c

Merge tag 'topic/core-stuff-2014-12-19' of git://anongit.freedesktop.org/drm-intel into drm-next

2015-01-09 09:13:41 +10:00

drm_legacy.h

drm: Create drm legacy driver header

2014-09-12 11:08:55 +02:00

drm_lock.c

drm: unexport drm_global_mutex

2014-09-12 11:19:47 +02:00

drm_memory.c

drm: Move drm_memory.c map support declarations to <drm/drm_legacy.h>

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

drm_mipi_dsi.c

drm/mipi-dsi: Avoid potential NULL pointer dereference

2015-01-28 08:45:37 +01:00

drm_mm.c

…

drm_modes.c

Merge tag 'imx-drm-next-2015-01-09' of git://git.pengutronix.de/git/pza/linux into drm-next

2015-01-21 10:17:16 +10:00

drm_modeset_lock.c

drm: Per-plane locking

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

drm_of.c

drm: add of_graph endpoint helper to find possible CRTCs

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

drm_panel.c

…

drm_pci.c

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

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

drm_plane_helper.c

Merge tag 'topic/atomic-core-2015-01-27' of git://anongit.freedesktop.org/drm-intel into drm-next

2015-01-28 09:34:27 +10:00

drm_platform.c

drm: Goody bye, drm_bus!

2014-09-10 17:43:10 +10:00

drm_prime.c

Merge tag 'drm/fixes/for-3.19-rc1' of git://people.freedesktop.org/~tagr/linux into drm-next

2014-11-15 09:37:20 +10:00

drm_probe_helper.c

drm/probe-helper: clamp unknown connector status in the poll work

2015-01-22 06:11:39 +01:00

drm_rect.c

drm: Add drm_rect rotation functions

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

drm_scatter.c

drm: Move sg functions into drm_legacy.h

2014-09-12 11:08:54 +02:00

drm_sysfs.c

drm: Move piles of functions from drmP.h to drm_internal.h

2014-09-12 11:16:29 +02:00

drm_trace_points.c

…

drm_trace.h

…

drm_vm.c

drm: Move drm_vm_open_locked into drm_internal.h

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

drm_vma_manager.c

…

Kconfig

drm/radeon: make MMU_NOTIFIER optional

2015-01-22 10:42:21 -05:00

Makefile

drm/bridge: make bridge registration independent of drm flow

2015-01-28 08:45:40 +01:00