Commit c9b685df authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-next-20230529' of... 

Merge tag 'drm-next-20230529' of git://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux

 into drm-next

Renesas DRM/KMS drivers:

- Group drivers in renesas subdirectory to prepare for new platform
- Drop deprecated R-Car H3 ES1.x support

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230602111504.GA24855@pendragon.ideasonboard.com
parents 2e149283 11696c5e

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -6981,8 +6981,7 @@ F: Documentation/devicetree/bindings/display/bridge/renesas,dsi-csi2-tx.yaml 
F:	Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.yaml

F:	Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml

F:	Documentation/devicetree/bindings/display/renesas,du.yaml

F:	drivers/gpu/drm/rcar-du/

F:	drivers/gpu/drm/shmobile/

F:	drivers/gpu/drm/renesas/

F:	include/linux/platform_data/shmob_drm.h









DRM DRIVERS FOR ROCKCHIP
































drivers/gpu/drm/Kconfig



+1
−3






























Original line number
Diff line number
Diff line







@@ -289,9 +289,7 @@ source "drivers/gpu/drm/armada/Kconfig"

















source "drivers/gpu/drm/atmel-hlcdc/Kconfig"



















source "drivers/gpu/drm/rcar-du/Kconfig"



















source "drivers/gpu/drm/shmobile/Kconfig"









source "drivers/gpu/drm/renesas/Kconfig"



















source "drivers/gpu/drm/sun4i/Kconfig"










































drivers/gpu/drm/Makefile



+1
−2






























Original line number
Diff line number
Diff line







@@ -156,8 +156,7 @@ obj-$(CONFIG_DRM_UDL) += udl/







obj-$(CONFIG_DRM_AST) += ast/









obj-$(CONFIG_DRM_ARMADA) += armada/









obj-$(CONFIG_DRM_ATMEL_HLCDC)	+= atmel-hlcdc/









obj-y			+= rcar-du/









obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/









obj-y			+= renesas/









obj-y			+= omapdrm/









obj-$(CONFIG_DRM_SUN4I) += sun4i/









obj-y			+= tilcdc/
































drivers/gpu/drm/renesas/Kconfig
0 → 100644



+4
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0-only



















source "drivers/gpu/drm/renesas/rcar-du/Kconfig"









source "drivers/gpu/drm/renesas/shmobile/Kconfig"
























drivers/gpu/drm/renesas/Makefile
0 → 100644



+4
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0



















obj-y += rcar-du/









obj-$(CONFIG_DRM_SHMOBILE) += shmobile/