1
0
Fork 0
alistair23-linux/drivers/gpu/drm/rockchip
Jason Liu 5691e22711 Merge tag 'v5.4.47' into imx_5.4.y
* tag 'v5.4.47': (2193 commits)
  Linux 5.4.47
  KVM: arm64: Save the host's PtrAuth keys in non-preemptible context
  KVM: arm64: Synchronize sysreg state on injecting an AArch32 exception
  ...

 Conflicts:
	arch/arm/boot/dts/imx6qdl.dtsi
	arch/arm/mach-imx/Kconfig
	arch/arm/mach-imx/common.h
	arch/arm/mach-imx/suspend-imx6.S
	arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
	arch/powerpc/include/asm/cacheflush.h
	drivers/cpufreq/imx6q-cpufreq.c
	drivers/dma/imx-sdma.c
	drivers/edac/synopsys_edac.c
	drivers/firmware/imx/imx-scu.c
	drivers/net/ethernet/freescale/fec.h
	drivers/net/ethernet/freescale/fec_main.c
	drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
	drivers/net/phy/phy_device.c
	drivers/perf/fsl_imx8_ddr_perf.c
	drivers/usb/cdns3/gadget.c
	drivers/usb/dwc3/gadget.c
	include/uapi/linux/dma-buf.h

Signed-off-by: Jason Liu <jason.hui.liu@nxp.com>
2020-06-19 17:32:49 +08:00
..
Kconfig drm: bridge: add Cadence MHDP HDMI/DP API 2019-11-25 16:00:58 +08:00
Makefile drm: bridge: add Cadence MHDP HDMI/DP API 2019-11-25 16:00:58 +08:00
analogix_dp-rockchip.c drm/bridge: analogix_dp: Split bind() into probe() and real bind() 2020-05-10 10:31:22 +02:00
cdn-dp-core.c MLK-24086: gpu: drm: rockchip: Fix cdn-dp driver build error 2020-05-21 11:24:23 +08:00
cdn-dp-core.h drm: bridge: cdns dp: Remove link rate/lanes set by device tree 2019-11-25 16:01:06 +08:00
dw-mipi-dsi-rockchip.c drm/rockchip: drop use of drmP.h 2019-07-17 12:52:55 +02:00
dw_hdmi-rockchip.c drm/rockchip: drop use of drmP.h 2019-07-17 12:52:55 +02:00
inno_hdmi.c drm/rockchip: drop use of drmP.h 2019-07-17 12:52:55 +02:00
inno_hdmi.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 282 2019-06-05 17:36:37 +02:00
rk3066_hdmi.c drm: rockchip: introduce rk3066 hdmi 2019-03-31 14:24:30 +02:00
rk3066_hdmi.h drm: rockchip: introduce rk3066 hdmi 2019-03-31 14:24:30 +02:00
rockchip_drm_drv.c drm main pull for 5.4-rc1 2019-09-19 16:24:24 -07:00
rockchip_drm_drv.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 282 2019-06-05 17:36:37 +02:00
rockchip_drm_fb.c drm/rockchip: Use drm_atomic_helper_commit_tail_rpm 2019-07-26 14:48:03 -04:00
rockchip_drm_fb.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 282 2019-06-05 17:36:37 +02:00
rockchip_drm_fbdev.c drm/rockchip: drop use of drmP.h 2019-07-17 12:52:55 +02:00
rockchip_drm_fbdev.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 282 2019-06-05 17:36:37 +02:00
rockchip_drm_gem.c drm/rockchip: drop use of drmP.h 2019-07-17 12:52:55 +02:00
rockchip_drm_gem.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 282 2019-06-05 17:36:37 +02:00
rockchip_drm_vop.c drm/rockchip: Round up _before_ giving to the clock framework 2020-01-26 10:01:04 +01:00
rockchip_drm_vop.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 282 2019-06-05 17:36:37 +02:00
rockchip_lvds.c drm/rockchip: drop use of drmP.h 2019-07-17 12:52:55 +02:00
rockchip_lvds.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 282 2019-06-05 17:36:37 +02:00
rockchip_rgb.c drm/rockchip: drop use of drmP.h 2019-07-17 12:52:55 +02:00
rockchip_rgb.h
rockchip_vop_reg.c drm/rockchip: drop use of drmP.h 2019-07-17 12:52:55 +02:00
rockchip_vop_reg.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 282 2019-06-05 17:36:37 +02:00