Gustavo Padovan d98c71dadc Merge drm-upstream/drm-next into drm-misc-next ...

We got a few conflicts in drm_atomic.c after merging the DRM writeback support,
now we need a backmerge to unlock develop development on drm-misc-next.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>

2018-06-20 13:22:22 -03:00

..

bridge

drm/bridge: analogix_dp: Split the platform-specific poweron in two parts

2018-04-24 08:34:49 +02:00

i2c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

tinydrm

drm: Move simple_display_pipe prepare_fb helper into gem fb helpers

2018-04-24 13:57:22 +02:00

ttm

drm/ttm: Export the ttm_k[un]map_atomic_prot API.

2018-03-22 11:10:06 +01:00

amd_asic_type.h

drm/amdgpu: Add vega20 to asic_type enum.

2018-05-17 10:13:09 -05:00

ati_pcigart.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

drm_agpsupport.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

drm_atomic_helper.h

drm: Don't pass clip to drm_atomic_helper_check_plane_state()

2018-03-05 20:48:25 +02:00

drm_atomic.h

drm: writeback: Add out-fences for writeback connectors

2018-06-20 15:29:18 +01:00

drm_auth.h

drm: Add drm_object lease infrastructure [v5]

2017-10-25 16:31:29 +10:00

drm_blend.h

drm/blend: Add a generic alpha property

2018-04-16 21:17:29 +02:00

drm_bridge.h

drm/bridge: spelling and coding style minor fixes

2018-05-17 17:19:32 +02:00

drm_cache.h

drm: add func to get max iomem address v2

2018-02-13 11:57:59 -05:00

drm_color_mgmt.h

drm: Introduce drm_color_lut_size()

2018-03-16 15:44:01 +02:00

drm_connector.h

drm: writeback: Add out-fences for writeback connectors

2018-06-20 15:29:18 +01:00

drm_crtc_helper.h

drm: Allow determining if current task is output poll worker

2018-02-16 22:30:06 +01:00

drm_crtc.h

drm: Add checks for atomic_[duplicate/destroy]_state with atomic drivers

2018-06-18 09:20:51 +02:00

drm_debugfs_crc.h

drm: Add API for capturing frame CRCs

2016-10-17 16:44:34 +02:00

drm_debugfs.h

drm/debugfs: Add kerneldoc

2017-03-24 09:36:06 +01:00

drm_device.h

drm: remove all control node code

2018-05-03 21:26:32 +02:00

drm_displayid.h

drm/edid: add displayid detailed 1 timings to the modelist. (v1.1)

2016-05-23 11:35:31 +10:00

drm_dp_dual_mode_helper.h

drm: Fix LSPCON kernel-doc

2016-10-19 18:20:40 +03:00

drm_dp_helper.h

Merge remote-tracking branch 'drm/drm-next' into drm-misc-next

2018-05-11 18:08:10 +02:00

drm_dp_mst_helper.h

drm/dp/mst: Sideband message transaction to power up/down nodes

2017-09-11 16:03:57 +03:00

drm_drv.h

Merge airlied/drm-next into drm-misc-next

2018-03-30 12:35:45 -04:00

drm_edid.h

drm: Don't EXPORT drm_add/reset_display_info

2018-04-24 21:34:53 +02:00

drm_encoder_slave.h

drm: Don't include <drm/drm_encoder.h> in <drm/drm_crtc.h>

2016-12-18 16:29:29 +05:30

drm_encoder.h

Merge airlied/drm-next into drm-misc-next

2017-11-21 14:17:56 +01:00

drm_fb_cma_helper.h

drm/cma-helper: Add drm_fb_cma_fbdev_init/fini()

2017-12-08 14:27:47 +01:00

drm_fb_helper.h

drm/fb-helper: Add drm_fb_helper_defio_init()

2017-12-20 14:52:22 +01:00

drm_file.h

drm: writeback: Add client capability for exposing writeback connectors

2018-06-20 15:30:20 +01:00

drm_fixed.h

drm: Add drm_fixp_from_fraction and drm_fixp2int_ceil

2016-02-05 15:23:48 +10:00

drm_flip_work.h

drm/kms-helpers: Use recommened kerneldoc for struct member refs

2017-01-25 16:18:57 +01:00

drm_fourcc.h

drm/fourcc: Add a alpha field to drm_format_info

2018-01-29 12:07:47 +01:00

drm_framebuffer.h

drm/framebuffer: Print task that allocated the fb in debug info.

2017-12-20 15:30:17 +01:00

drm_gem_cma_helper.h

Merge tag 'drm-misc-next-2017-11-30' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

2017-12-04 05:42:49 +10:00

drm_gem_framebuffer_helper.h

drm: Move simple_display_pipe prepare_fb helper into gem fb helpers

2018-04-24 13:57:22 +02:00

drm_gem.h

drm: move read_domains and write_domain into i915

2018-02-16 14:12:48 +00:00

drm_global.h

drm: drop extern from function decls

2017-03-24 09:36:06 +01:00

drm_hashtab.h

drm: drop extern from function decls

2017-03-24 09:36:06 +01:00

drm_hdcp.h

drm: Fix HDCP downstream dev count read

2018-04-16 12:10:48 -04:00

drm_ioctl.h

drm: remove all control node code

2018-05-03 21:26:32 +02:00

drm_irq.h

drm: Extract drm_vblank.[hc]

2017-06-01 08:02:14 +02:00

drm_lease.h

drm: Add four ioctls for managing drm mode object leases [v7]

2017-10-25 16:31:30 +10:00

drm_legacy.h

drm: prefer inline over __inline__

2018-03-28 09:34:12 +03:00

drm_mipi_dsi.h

drm/dsi: Implement DCS set/get display brightness

2016-08-24 13:34:00 +02:00

drm_mm.h

drm/mm: Add a search-by-address variant to only inspect a single hole

2018-05-24 15:04:30 +01:00

drm_mode_config.h

drm: writeback: Add out-fences for writeback connectors

2018-06-20 15:29:18 +01:00

drm_mode_object.h

drm: remove drm_mode_object_{un/reference} aliases

2018-03-19 09:09:46 -04:00

drm_modes.h

drm: Expose modes with aspect ratio, only if requested

2018-05-11 09:06:39 +02:00

drm_modeset_helper_vtables.h

drm: Add writeback connector type

2018-06-20 15:27:49 +01:00

drm_modeset_helper.h

drm/modeset-helper: Add simple modeset suspend/resume helpers

2017-11-30 18:18:08 +01:00

drm_modeset_lock.h

drm/atomic: Prepare drm_modeset_lock infrastructure for interruptible waiting, v2.

2017-09-13 09:50:52 +02:00

drm_of.h

Merge tag 'drm-for-v4.15' of git://people.freedesktop.org/~airlied/linux

2017-11-15 20:42:10 -08:00

drm_os_linux.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

drm_panel.h

drm/panel: Add device_link from panel device to DRM device

2018-05-18 11:22:06 +02:00

drm_pci.h

drm/pci: Deprecate drm_pci_init/exit completely

2017-06-20 10:41:03 +02:00

drm_pciids.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

drm_plane_helper.h

drm: Don't pass clip to drm_atomic_helper_check_plane_state()

2018-03-05 20:48:25 +02:00

drm_plane.h

drm: Add checks for atomic_[duplicate/destroy]_state with atomic drivers

2018-06-18 09:20:51 +02:00

drm_prime.h

dma-buf: remove kmap_atomic interface

2018-06-20 15:59:34 +02:00

drm_print.h

drm: Reduce object size of DRM_DEV_<LEVEL> uses

2018-03-19 15:15:42 +01:00

drm_property.h

drm: Don't pass the index to drm_property_add_enum()

2018-04-27 16:46:50 +03:00

drm_rect.h

drm/rect: Handle rounding errors in drm_rect_clip_scaled, v3.

2018-05-04 11:09:54 +02:00

drm_scdc_helper.h

drm: Fix warning when building docs for scdc_helper

2017-07-31 14:24:14 +02:00

drm_simple_kms_helper.h

drm: Move simple_display_pipe prepare_fb helper into gem fb helpers

2018-04-24 13:57:22 +02:00

drm_syncobj.h

drm/syncobj: some kerneldoc polish

2017-12-15 11:26:52 +01:00

drm_sysfs.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

drm_utils.h

drm: Add panel orientation quirks, v6.

2017-12-04 23:03:21 +01:00

drm_vblank.h

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

2018-03-01 14:07:22 +10:00

drm_vma_manager.h

drm/vma-manager: drm_vma_node_start() constify argument

2017-11-11 11:19:37 +01:00

drm_writeback.h

drm: writeback: Add out-fences for writeback connectors

2018-06-20 15:29:18 +01:00

drmP.h

drm: make drm_core_check_feature() bool that it is

2018-03-28 09:35:20 +03:00

gma_drm.h

drm/gma500: Remove unused ioctls

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

gpu_scheduler.h

drm/scheduler: Remove obsolete spinlock.

2018-05-18 16:08:17 -05:00

i915_component.h

drm/i915/cnl: Add Port F definition.

2018-01-19 17:51:35 -02:00

i915_drm.h

x86/early-quirks: export the stolen region as a resource

2017-12-12 12:30:18 +02:00

i915_pciids.h

drm/i915/kbl: Add KBL GT2 sku

2018-04-23 16:09:38 -07:00

intel_lpe_audio.h

ALSA: x86: Register multiple PCM devices for the LPE audio card

2017-05-03 16:24:00 +03:00

intel-gtt.h

drm/i915: prefer resource_size_t for everything stolen

2017-12-12 12:30:22 +02:00

spsc_queue.h

drm: move amd_gpu_scheduler into common location

2017-12-07 11:51:56 -05:00