iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers/gpu/drm
History
Dave Airlie e8115e79aa Linux 3.18-rc7 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJUe7l9AAoJEHm+PkMAQRiGkGcIAIryQ7NKn4IaxUtS807Lx4Ih
 obEnx7nNKZTXCZpD/7XQGHMMJyozMJR50PHZESJoHu4Luhv9h7EFRnyJ6MdqMlwn
 zla3zY0yRsHwPoJKcHbSE0CPHZz0WPQHj7IEbM+XJz2tMNJfbgTrezElmcCM4DRp
 c9ae+ggwZ2cyNYM0r2RSwSJ525WMh69f9dzSUE27fpvkllQgwqNs/jHYz8HNOEht
 FWcv5UhvzKjwJS3awULfOB3zH2QdFvVTrwAzd+kbV2Q6T6CaUoFRlhXeKUO6W2Jv
 pJM6oj8tMZUkdXEv7EQXT1kwEqC4DULTTTHs4tSF79O1ESmNfePiOwwBcwoM2nM=
 =kG1Y
 -----END PGP SIGNATURE-----

Merge tag 'v3.18-rc7' into drm-next

This fixes a bunch of conflicts prior to merging i915 tree.

Linux 3.18-rc7

Conflicts:
	drivers/gpu/drm/exynos/exynos_drm_drv.c
	drivers/gpu/drm/i915/i915_drv.c
	drivers/gpu/drm/i915/intel_pm.c
	drivers/gpu/drm/tegra/dc.c
2014-12-02 10:58:33 +10:00
..
amd
amdkfd: delete some dead code
2014-11-25 19:43:29 +03:00
armada
Linux 3.18-rc4
2014-11-12 17:53:30 +10:00
ast
drm: Move drm_crtc_init from drm_crtc.h to drm_plane_helper.h
2014-11-05 00:14:55 +01:00
bochs
bochs: add page_flip
2014-11-20 11:27:31 +10:00
bridge
drm: add register and unregister functions for connectors
2014-06-19 08:55:28 +02:00
cirrus
drm/cirrus: allow 32bpp framebuffers for cirrus drm
2014-11-20 11:42:46 +10:00
exynos
Linux 3.18-rc7
2014-12-02 10:58:33 +10:00
gma500
drm: Miscellaneous fixes for v3.19-rc1
2014-11-15 09:37:20 +10:00
i2c
drm: Add adv7511 encoder driver
2014-11-26 20:09:40 +02:00
i810
drm: move drm_mmap to <drm/drm_legacy.h>
2014-09-24 11:43:07 +10:00
i915
Linux 3.18-rc7
2014-12-02 10:58:33 +10:00
imx
drm: imx: Move imx-drm driver out of staging
2014-11-26 09:40:39 +10:00
mga
drm: move drm_mmap to <drm/drm_legacy.h>
2014-09-24 11:43:07 +10:00
mgag200
drm: Move drm_crtc_init from drm_crtc.h to drm_plane_helper.h
2014-11-05 00:14:55 +01:00
msm
drm/msm: switch to atomic-helpers iterator macros
2014-11-27 15:39:09 +01:00
nouveau
Linux 3.18-rc7
2014-12-02 10:58:33 +10:00
omapdrm
drm: omapdrm: remove unused variable
2014-11-20 11:29:39 +10:00
panel
drm/panel: Add Sharp LQ101R1SX01 support
2014-11-13 13:56:19 +01:00
qxl
drm/qxl: drop unused mode private pointer
2014-11-15 10:15:30 +10:00
r128
drm: remove unnecessary sizeof(u8)
2014-11-20 11:30:37 +10:00
radeon
Linux 3.18-rc7
2014-12-02 10:58:33 +10:00
rcar-du
drm: rcar-du: Add HDMI encoder and connector support
2014-11-26 20:09:38 +02:00
savage
drm: move drm_mmap to <drm/drm_legacy.h>
2014-09-24 11:43:07 +10:00
shmobile
drm: Move drm_crtc_init from drm_crtc.h to drm_plane_helper.h
2014-11-05 00:14:55 +01:00
sis
drm: move drm_mmap to <drm/drm_legacy.h>
2014-09-24 11:43:07 +10:00
sti
drm: Move drm_crtc_init from drm_crtc.h to drm_plane_helper.h
2014-11-05 00:14:55 +01:00
tdfx
drm: move drm_mmap to <drm/drm_legacy.h>
2014-09-24 11:43:07 +10:00
tegra
Linux 3.18-rc7
2014-12-02 10:58:33 +10:00
tilcdc
drm/tilcdc: Deletion of an unnecessary check before the function call "drm_fbdev_cma_hotplug_event"
2014-11-21 12:16:31 +10:00
ttm
drm/ttm: Avoid memory allocation from shrinker functions.
2014-11-20 11:31:56 +10:00
udl
drm/udl: properly check for error pointers
2014-11-26 10:03:18 +10:00
via
drm: move drm_mmap to <drm/drm_legacy.h>
2014-09-24 11:43:07 +10:00
vmwgfx
drm/vmwgfx: Deletion of an unnecessary check before the function call "vfree"
2014-11-21 12:16:40 +10: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: clear plane's CRTC and FB when shutting down
2014-11-27 15:39:11 +01:00
drm_atomic.c
drm/atomic: track bitmask of planes attached to crtc
2014-11-27 15:38:15 +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_bufs.c
drm: Move __drm_pci_free to drm_legacy.h
2014-09-12 11:08:56 +02:00
drm_cache.c
…
drm_context.c
drm: mark drm_context support as legacy
2014-08-05 19:38:12 +02:00
drm_crtc_helper.c
drm/atomic: Refcounting for plane_state->fb
2014-11-06 21:08:37 +01:00
drm_crtc_internal.h
…
drm_crtc.c
drm: Handle atomic state properly in kms getfoo ioctl
2014-11-27 15:39:11 +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 counters in the drm_dp_aux struct for I2C NACKs and DEFERs
2014-11-05 14:03:22 +01:00
drm_dp_mst_topology.c
drm/dp/mst: Handle invalid link bandwidth from DPCD gracefully
2014-11-15 09:31:34 +10:00
drm_drv.c
drm: Document that drm_dev_alloc doesn't need a parent
2014-11-25 13:12:42 +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
drm: Decouple EDID parsing from I2C adapter
2014-11-26 20:09:39 +02: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
drm: Remove compiler BUG_ON() test
2014-11-04 09:47:45 +01: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: Implement O_NONBLOCK support on /dev/dri/cardN
2014-10-08 15:07:07 +02: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
list: fix order of arguments for hlist_add_after(_rcu)
2014-08-06 18:01:24 -07:00
drm_info.c
drm: Extract <drm/drm_gem.h>
2014-09-24 11:43:41 +10:00
drm_internal.h
drm: Move internal debugfs functions to drm_internal.h
2014-09-24 11:43:35 +10:00
drm_ioc32.c
…
drm_ioctl.c
drm: Purge ioctl forward declarations from drmP.h
2014-09-12 15:27:47 +02:00
drm_irq.c
drm/irq: BUG_ON() -> WARN_ON()
2014-11-20 11:33:51 +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/dsi: Do not require .owner field to be set
2014-11-13 13:56:17 +01:00
drm_mm.c
…
drm_modes.c
gpu:drm: Fix typo in Documentation/DocBook/drm.xml
2014-10-21 10:55:33 +02: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
drm/plane: Pass old state to ->atomic_update()
2014-11-25 13:27:58 +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: Fix DRM_FORCE_ON_DIGITAL use
2014-11-04 09:45:04 +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: imx: Move imx-drm driver out of staging
2014-11-26 09:40:39 +10:00
Makefile
drm: imx: Move imx-drm driver out of staging
2014-11-26 09:40:39 +10:00