]> git.baikalelectronics.ru Git - kernel.git/commit
Merge drm/drm-next into drm-misc-next
authorMaxime Ripard <maxime.ripard@bootlin.com>
Fri, 11 Jan 2019 15:32:10 +0000 (16:32 +0100)
committerMaxime Ripard <maxime.ripard@bootlin.com>
Fri, 11 Jan 2019 15:32:10 +0000 (16:32 +0100)
commit0b18b3a4b9caea1ade7fc42e70041b55b36da62d
tree39f0b657e5b1b5b958780cae4ae6360f69548d50
parenta3e36ac1c747ddd317606df8500d6f43007c81b8
parent7c4e0f10570f90bb74571a89aea3722ff2e6b6dc
Merge drm/drm-next into drm-misc-next

drm-next has been forwarded to 5.0-rc1, and we need it to apply the damage
helper for dirtyfb series from Noralf Trønnes.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
20 files changed:
Documentation/gpu/drm-kms-helpers.rst
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/drm_fb_helper.c
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_hdmi.c
drivers/gpu/drm/meson/meson_dw_hdmi.c
drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c
drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c
drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c
drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c
drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
drivers/gpu/drm/nouveau/dispnv50/disp.c
drivers/gpu/drm/omapdrm/omap_encoder.c
drivers/gpu/drm/tegra/sor.c
include/drm/drm_connector.h
include/drm/drm_crtc.h