Daniel Vetter 0f9e9cd61f Merge tag 'drm-intel-fixes-2015-03-19' into drm-intel-next ...

Backmerge because of numerous and interleaving conflicts and git
rerere getting confused a bit too often.

Conflicts:
	drivers/gpu/drm/i915/intel_display.c

All conflicts are because of -next patches backported to -fixes, so
just go with the code in -next.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

2015-03-20 11:44:34 +01:00

..

amd

drm/amdkfd: don't set get_pipes_num() as inline

2015-02-23 10:48:02 +02: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

Linux 4.0-rc3

2015-03-09 19:58:30 +10: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

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

2015-02-16 15:48:00 -08:00

exynos

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

2015-02-13 13:02:49 +10:00

gma500

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

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

i2c

drm: Fix trivial typos in comments

2015-03-10 09:59:34 +01:00

i810

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

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

i915

Merge tag 'drm-intel-fixes-2015-03-19' into drm-intel-next

2015-03-20 11:44:34 +01:00

imx

DRM: i.MX: parallel display: Support probe deferral for finding DRM panel

2015-02-23 17:19:25 +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

Linux 4.0-rc3

2015-03-09 19:58:30 +10:00

nouveau

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

2015-03-05 09:04:39 +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 backlight dependency

2015-01-31 10:11:45 +10: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

drm/radeon: drop setting UPLL to sleep mode

2015-03-11 08:31:56 -04:00

rcar-du

drm: rcar-du: Fix race condition in hardware plane allocator

2015-03-03 16:16:30 +02:00

rockchip

Revert "drm/rockchip: Flip select/depends in Kconfig"

2015-03-03 21:11:34 +10:00

savage

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

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

shmobile

drm: Kconfig: Let all DRM_GEM_CMA_HELPER related macros depend on HAVE_DMA_ATTRS

2015-02-03 11:12:37 +10:00

sis

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

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

sti

drm: sti: HDMI add audio infoframe

2015-02-05 16:21:19 +01:00

tdfx

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

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

tegra

Linux 4.0-rc3

2015-03-09 19:58:30 +10:00

tilcdc

drm: Kconfig: Let all DRM_GEM_CMA_HELPER related macros depend on HAVE_DMA_ATTRS

2015-02-03 11:12:37 +10:00

ttm

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

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

udl

drm/udl: properly set active_16 flag in udl_crtc_page_flip(). (v2)

2015-01-31 10:12:23 +10:00

via

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

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

vmwgfx

drm/vmwgfx: Fix an issue with the device losing its irq line on module unload

2015-03-11 11:47:41 -07: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

drm/atomic-helper: Fix kerneldoc for prepare_planes

2015-03-10 09:59:31 +01:00

drm_atomic.c

drm: Share plane pixel format check code between legacy and atomic

2015-03-10 09:59:35 +01: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_crtc_helper.c

drm: add support for tiled/compressed/etc modifier in addfb2

2015-02-13 23:28:12 +01:00

drm_crtc_internal.h

drm/atomic: Hide drm.ko internal interfaces

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

drm_crtc.c

Merge tag 'drm-intel-fixes-2015-03-19' into drm-intel-next

2015-03-20 11:44:34 +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: add drm_dp_link_power_down() helper

2015-02-01 15:06:42 -05:00

drm_dp_mst_topology.c

drm/mst: fix recursive sleep warning on qlock

2015-03-10 13:44:31 +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_fb_helper.c

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

2015-02-16 15:48:00 -08: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

drm: Sanitize DRM_IOCTL_MODE_CREATE_DUMB input

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

drm_global.c

…

drm_hashtab.c

…

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: add support for tiled/compressed/etc modifier in addfb2

2015-02-13 23:28:12 +01:00

drm_irq.c

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

2015-03-09 19:41:15 +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

[PATCH] drm/mm: Fix support 4 GiB and larger ranges

2015-03-16 06:28:50 +10:00

drm_modes.c

drm: Fix trivial typos in comments

2015-03-10 09:59:34 +01:00

drm_modeset_lock.c

drm: Per-plane locking

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

drm_of.c

…

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

drm: Check in setcrtc if the primary plane supports the fb pixel format

2015-03-10 09:59:36 +01:00

drm_platform.c

drm: Goody bye, drm_bus!

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

drm_prime.c

drm: Miscellaneous fixes for v3.19-rc1

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_scatter.c

drm: Move sg functions into drm_legacy.h

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

drm_sysfs.c

drm: Lighten sysfs connector 'status'

2015-03-10 09:59:36 +01: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

mm: remove rest usage of VM_NONLINEAR and pte_file()

2015-02-10 14:30:31 -08:00

Kconfig

drm: Kconfig: Let all DRM_GEM_CMA_HELPER related macros depend on HAVE_DMA_ATTRS

2015-02-03 11:12:37 +10:00

Makefile

drm/bridge: make bridge registration independent of drm flow

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