Greg Kroah-Hartman 52eaf83d7b ANDROID: fix up merge issues in drm_mipi_dsi.h ...

0e9cdc9863 ("Revert "ANDROID: include: drm: support unicasting mipi
cmds to dsi ctrls"") left an out-of-tree difference, so fix that up.

Reported-by: Matthias Maennich <maennich@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I27ae5707b35bb25ec3ff5c55ab07fb712c496642

2021-01-22 19:15:07 +00:00

..

bridge

drm/bridge: dw-mipi-dsi: permit configuring the escape clock rate

2020-09-11 15:01:36 +02:00

i2c

…

ttm

drm/ttm: add multihop infrastrucutre (v3)

2020-11-11 11:11:03 +10:00

amd_asic_type.h

drm/amdgpu: add dimgrey_cavefish asic type

2020-10-12 14:00:01 -04:00

drm_agpsupport.h

…

drm_atomic_helper.h

drm: fix some kernel-doc markups

2020-11-16 20:48:20 +01:00

drm_atomic_state_helper.h

…

drm_atomic_uapi.h

…

drm_atomic.h

include/drm/drm_atomic: Make use of 'new_crtc_state'

2020-11-18 11:51:58 +01:00

drm_audio_component.h

ALSA: hda/i915 - fix list corruption with concurrent probes

2020-10-09 16:46:04 +02:00

drm_auth.h

…

drm_blend.h

…

drm_bridge_connector.h

…

drm_bridge.h

…

drm_cache.h

…

drm_client.h

drm/gem: Store client buffer mappings as struct dma_buf_map

2020-11-09 09:19:45 +01:00

drm_color_mgmt.h

…

drm_connector.h

drm: fix some kernel-doc markups

2020-11-16 20:48:20 +01:00

drm_crtc_helper.h

…

drm_crtc.h

Merge tag 'drm-msm-next-2020-12-07' of https://gitlab.freedesktop.org/drm/msm into drm-next

2020-12-10 09:42:47 +10:00

drm_damage_helper.h

…

drm_debugfs_crc.h

…

drm_debugfs.h

…

drm_device.h

drm: fix some kernel-doc markups

2020-11-16 20:48:20 +01:00

drm_displayid.h

…

drm_dp_dual_mode_helper.h

…

drm_dp_helper.h

Merge tag 'drm-intel-next-queued-2020-11-03' of git://anongit.freedesktop.org/drm/drm-intel into drm-next

2020-11-04 12:17:34 +10:00

drm_dp_mst_helper.h

Merge drm/drm-next into drm-intel-next-queued

2020-09-11 20:00:20 -04:00

drm_drv.h

Merge 1d36dffa5d ("Merge tag 'drm-next-2020-12-11' of git://anongit.freedesktop.org/drm/drm") into android-mainline

2020-12-15 12:13:42 +01:00

drm_dsc.h

drm: fix some kernel-doc markups

2020-11-16 20:48:20 +01:00

drm_edid.h

drm: drm_edid: remove a duplicated kernel-doc declaration

2020-10-27 11:20:55 +01:00

drm_encoder_slave.h

…

drm_encoder.h

drm/encoder: remove obsolete documentation of bridge

2020-11-07 23:12:53 +01:00

drm_fb_cma_helper.h

…

drm_fb_helper.h

drm/fb-helper: Rename dirty worker to damage worker

2020-11-24 09:27:55 +01:00

drm_file.h

…

drm_fixed.h

…

drm_flip_work.h

…

drm_format_helper.h

…

drm_fourcc.h

…

drm_framebuffer.h

…

drm_gem_cma_helper.h

drm/cma-helper: Make default object functions the default

2020-11-09 09:23:03 +01:00

drm_gem_framebuffer_helper.h

…

drm_gem_shmem_helper.h

drm/shmem-helper: Removed drm_gem_shmem_create_object_cached()

2020-11-24 09:10:33 +01:00

drm_gem_ttm_helper.h

drm/ttm: Add vmap/vunmap to TTM and TTM GEM helpers

2020-11-09 09:17:36 +01:00

drm_gem_vram_helper.h

drm: fix some kernel-doc markups

2020-11-16 20:48:20 +01:00

drm_gem.h

drm/gem: Use struct dma_buf_map in GEM vmap ops and convert GEM backends

2020-11-09 09:19:24 +01:00

drm_hashtab.h

…

drm_hdcp.h

drm/i915: Fix sha_text population code

2020-09-02 10:48:11 +03:00

drm_ioctl.h

…

drm_irq.h

…

drm_lease.h

…

drm_legacy.h

…

drm_managed.h

…

drm_mipi_dbi.h

…

drm_mipi_dsi.h

ANDROID: fix up merge issues in drm_mipi_dsi.h

2021-01-22 19:15:07 +00:00

drm_mm.h

drm: fix spelling error in comments

2020-09-17 13:39:44 +02:00

drm_mode_config.h

drm/fb_helper: Support framebuffers in I/O memory

2020-11-09 09:20:00 +01:00

drm_mode_object.h

…

drm_modes.h

drm: document drm_mode_modeinfo

2020-11-20 11:55:41 +01:00

drm_modeset_helper_vtables.h

drm: Pass the full state to connectors atomic functions

2020-11-20 12:23:53 +01:00

drm_modeset_helper.h

…

drm_modeset_lock.h

…

drm_of.h

…

drm_panel.h

Revert "ANDROID: driver: gpu: drm: add notifier for panel related events"

2020-10-16 05:37:35 +00:00

drm_pciids.h

…

drm_plane_helper.h

…

drm_plane.h

drm: Introduce plane and CRTC scaling filter properties

2020-10-21 12:19:54 +03:00

drm_prime.h

Merge 1d36dffa5d ("Merge tag 'drm-next-2020-12-11' of git://anongit.freedesktop.org/drm/drm") into android-mainline

2020-12-15 12:13:42 +01:00

drm_print.h

drm: drm_print.h: fix kernel-doc markups

2020-10-27 11:21:39 +01:00

drm_probe_helper.h

…

drm_property.h

…

drm_rect.h

…

drm_scdc_helper.h

…

drm_self_refresh_helper.h

…

drm_simple_kms_helper.h

…

drm_syncobj.h

…

drm_sysfs.h

…

drm_util.h

…

drm_utils.h

…

drm_vblank_work.h

…

drm_vblank.h

…

drm_vma_manager.h

…

drm_writeback.h

…

gma_drm.h

…

gpu_scheduler.h

Merge tag 'amd-drm-next-5.10-2020-09-03' of git://people.freedesktop.org/~agd5f/linux into drm-next

2020-09-08 16:40:13 +10:00

i915_component.h

…

i915_drm.h

…

i915_mei_hdcp_interface.h

…

i915_pciids.h

drm/i915: Sort EHL/JSL PCI IDs

2020-11-06 14:09:30 +02:00

intel_lpe_audio.h

…

intel-gtt.h

iommu/vt-d: Move intel_iommu_gfx_mapped to Intel IOMMU header

2020-09-04 12:12:45 +02:00

spsc_queue.h

…

task_barrier.h

…