drm/dp: Move DisplayPort helpers into own module
Subsystems (20)
Thomas Zimmermann
maintainerv3 cover drm/dp: Move DisplayPort helpers into own module
Split-off DisplayPort functions from KMS helper library and move them into their own module. Reduces the size of drm_kms_helper.ko by ~50%.
This patchset is part of an on-going effort to reduce the minimum binary size of the DRM core and helpers. It's helpful for systems with early-boot DRM graphics, which requires DRM to be linked into the kernel image.
v3:
* fix include statement in DRM selftests
* rebase
v2:
* move helper library into subdirectory (Jani)
* also move DP AUX bus helpers
Thomas Zimmermann (5):
drm/dp_mst: Remove trailing whitespace.
drm/dp: Move DP declarations into separate header file drm/dp: Move DisplayPort helpers into separate helper module drm/dp: Move public DisplayPort headers into dp/ drm/dp: Move DisplayPort AUX bus helpers into dp/
drivers/gpu/drm/Kconfig | 8 +++++
drivers/gpu/drm/Makefile | 12 +++----
.../gpu/drm/amd/amdgpu/amdgpu_connectors.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 +--
drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 2 +-
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 +-
.../display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 +--
.../drm/amd/display/dc/core/dc_link_dpcd.c | 2 +-
drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 2 +-
drivers/gpu/drm/amd/display/dc/os_types.h | 2 +-
.../gpu/drm/amd/display/include/dpcd_defs.h | 2 +-
.../gpu/drm/amd/display/modules/hdcp/hdcp.h | 2 +-
drivers/gpu/drm/bridge/Kconfig | 4 +++
drivers/gpu/drm/bridge/analogix/Kconfig | 2 ++
.../drm/bridge/analogix/analogix-anx6345.c | 2 +-
.../drm/bridge/analogix/analogix-anx78xx.c | 2 +-
.../drm/bridge/analogix/analogix-i2c-dptx.c | 2 +-
.../drm/bridge/analogix/analogix_dp_core.h | 2 +-
drivers/gpu/drm/bridge/analogix/anx7625.c | 2 +-
drivers/gpu/drm/bridge/cadence/Kconfig | 1 +
.../drm/bridge/cadence/cdns-mhdp8546-core.c | 2 +-
.../drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/parade-ps8640.c | 4 +--
drivers/gpu/drm/bridge/tc358767.c | 2 +-
drivers/gpu/drm/bridge/tc358775.c | 2 +-
drivers/gpu/drm/bridge/ti-sn65dsi86.c | 4 +--
drivers/gpu/drm/dp/Makefile | 9 +++++
.../gpu/drm/{drm_dp_helper.c => dp/drm_dp.c} | 6 ++--
drivers/gpu/drm/{ => dp}/drm_dp_aux_bus.c | 4 +--
drivers/gpu/drm/{ => dp}/drm_dp_aux_dev.c | 6 ++--
drivers/gpu/drm/{ => dp}/drm_dp_cec.c | 2 +-
.../drm/{ => dp}/drm_dp_dual_mode_helper.c | 2 +-
drivers/gpu/drm/dp/drm_dp_helper_internal.h | 33 +++++++++++++++++++
drivers/gpu/drm/dp/drm_dp_helper_mod.c | 22 +++++++++++++
.../gpu/drm/{ => dp}/drm_dp_mst_topology.c | 6 ++--
.../{ => dp}/drm_dp_mst_topology_internal.h | 2 +-
drivers/gpu/drm/drm_crtc_helper_internal.h | 27 ---------------
drivers/gpu/drm/drm_dsc.c | 2 +-
drivers/gpu/drm/drm_kms_helper_common.c | 14 --------
drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +-
drivers/gpu/drm/gma500/intel_bios.c | 2 +-
drivers/gpu/drm/i915/Kconfig | 1 +
drivers/gpu/drm/i915/display/intel_bios.c | 2 +-
drivers/gpu/drm/i915/display/intel_display.c | 2 +-
.../drm/i915/display/intel_display_types.h | 4 +--
drivers/gpu/drm/i915/display/intel_dp.c | 2 +-
drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 4 +--
.../drm/i915/display/intel_dp_link_training.h | 2 +-
drivers/gpu/drm/i915/display/intel_lspcon.c | 2 +-
drivers/gpu/drm/msm/Kconfig | 1 +
drivers/gpu/drm/msm/dp/dp_audio.c | 2 +-
drivers/gpu/drm/msm/dp/dp_aux.h | 2 +-
drivers/gpu/drm/msm/dp/dp_catalog.c | 2 +-
drivers/gpu/drm/msm/dp/dp_ctrl.c | 2 +-
drivers/gpu/drm/nouveau/Kconfig | 1 +
drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_connector.h | 2 +-
drivers/gpu/drm/nouveau/nouveau_dp.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_encoder.h | 4 +--
drivers/gpu/drm/panel/panel-edp.c | 4 +--
.../gpu/drm/panel/panel-samsung-atna33xc20.c | 4 +--
drivers/gpu/drm/radeon/atombios_dp.c | 2 +-
drivers/gpu/drm/radeon/radeon_connectors.c | 2 +-
drivers/gpu/drm/radeon/radeon_dp_mst.c | 2 +-
drivers/gpu/drm/radeon/radeon_mode.h | 4 +--
drivers/gpu/drm/rockchip/Kconfig | 1 +
.../gpu/drm/rockchip/analogix_dp-rockchip.c | 2 +-
drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +-
drivers/gpu/drm/rockchip/cdn-dp-core.h | 2 +-
drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +-
drivers/gpu/drm/rockchip/rockchip_rgb.c | 2 +-
.../drm/selftests/test-drm_dp_mst_helper.c | 4 +--
drivers/gpu/drm/tegra/Kconfig | 1 +
drivers/gpu/drm/tegra/dp.c | 2 +-
drivers/gpu/drm/tegra/dpaux.c | 2 +-
drivers/gpu/drm/tegra/sor.c | 2 +-
drivers/gpu/drm/xlnx/Kconfig | 1 +
drivers/gpu/drm/xlnx/zynqmp_dp.c | 2 +-
include/drm/{ => dp}/drm_dp_aux_bus.h | 0
.../drm/{ => dp}/drm_dp_dual_mode_helper.h | 0
include/drm/{ => dp}/drm_dp_helper.h | 0
include/drm/{ => dp}/drm_dp_mst_helper.h | 2 +-
include/drm/drm_dsc.h | 2 +-
84 files changed, 172 insertions(+), 132 deletions(-)
create mode 100644 drivers/gpu/drm/dp/Makefile
rename drivers/gpu/drm/{drm_dp_helper.c => dp/drm_dp.c} (99%)
rename drivers/gpu/drm/{ => dp}/drm_dp_aux_bus.c (99%)
rename drivers/gpu/drm/{ => dp}/drm_dp_aux_dev.c (98%)
rename drivers/gpu/drm/{ => dp}/drm_dp_cec.c (99%)
rename drivers/gpu/drm/{ => dp}/drm_dp_dual_mode_helper.c (99%)
create mode 100644 drivers/gpu/drm/dp/drm_dp_helper_internal.h
create mode 100644 drivers/gpu/drm/dp/drm_dp_helper_mod.c
rename drivers/gpu/drm/{ => dp}/drm_dp_mst_topology.c (99%)
rename drivers/gpu/drm/{ => dp}/drm_dp_mst_topology_internal.h (94%)
rename include/drm/{ => dp}/drm_dp_aux_bus.h (100%)
rename include/drm/{ => dp}/drm_dp_dual_mode_helper.h (100%)
rename include/drm/{ => dp}/drm_dp_helper.h (100%)
rename include/drm/{ => dp}/drm_dp_mst_helper.h (99%)base-commit: fbce7b8d8df5af8d404b6aeaf63779f91bdbeb5d
prerequisite-patch-id: c2b2f08f0eccc9f5df0c0da49fa1d36267deb11d
prerequisite-patch-id: c67e5d886a47b7d0266d81100837557fda34cb24
prerequisite-patch-id: f89fb57d67dafa8cd0adc24bdcccd8faa1d790b4
Signature · 1 line
2.34.1
Thomas Zimmermann
maintainerPATCH v3 1/5 drm/dp_mst: Remove trailing whitespace.
Fix coding style.
--- drivers/gpu/drm/drm_dp_mst_topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_dp_mst_topology.c +1 -1
@@ -4811,7 +4811,7 @@ static void drm_dp_mst_dump_mstb(struct seq_file *m,seq_printf (m,"%smstb - [%p]: num_ports: %d\n" , prefix, mstb, mstb->num_ports);list_for_each_entry (port, &mstb->ports, next) { - seq_printf(m, "%sport %d - [%p] (%s - %s): ddps: %d, ldps: %d, sdp: %d/%d, fec: %s, conn: %p\n", + seq_printf(m, "%sport %d - [%p] (%s - %s): ddps: %d, ldps: %d, sdp: %d/%d, fec: %s, conn: %p\n", prefix, port->port_num, port,
Signature · 1 line
2.34.1
Thomas Zimmermann
maintainerPATCH v3 2/5 drm/dp: Move DP declarations into separate header file
In reply to Thomas ZimmermannSplit the DP declarations from other helpers before moving the DP functions into a separate module.
v2:
* forward-declare struct drm_dp_aux (Jani)
* add include guards in drm_dp_helper_internal.h
--- drivers/gpu/drm/drm_crtc_helper_internal.h | 27 ------------------ drivers/gpu/drm/drm_dp_aux_dev.c | 2 +- drivers/gpu/drm/drm_dp_helper.c | 2 +- drivers/gpu/drm/drm_dp_helper_internal.h | 33 ++++++++++++++++++++++ drivers/gpu/drm/drm_dp_mst_topology.c | 2 +- drivers/gpu/drm/drm_kms_helper_common.c | 1 + 6 files changed, 37 insertions(+), 30 deletions(-) create mode 100644 drivers/gpu/drm/drm_dp_helper_internal.h
drivers/gpu/drm/drm_crtc_helper_internal.h +0 -27
@@ -28,36 +28,9 @@#include <drm/drm_connector.h> #include <drm/drm_crtc.h> -#include <drm/drm_dp_helper.h> #include <drm/drm_encoder.h> #include <drm/drm_modes.h> -/* drm_dp_aux_dev.c */ -#ifdef CONFIG_DRM_DP_AUX_CHARDEV -int drm_dp_aux_dev_init (void ); -void drm_dp_aux_dev_exit (void ); -int drm_dp_aux_register_devnode (struct drm_dp_aux *aux); -void drm_dp_aux_unregister_devnode (struct drm_dp_aux *aux); -#else -static inline int drm_dp_aux_dev_init (void ) -{ -return 0 ; -} - -static inline void drm_dp_aux_dev_exit (void ) -{ -} - -static inline int drm_dp_aux_register_devnode (struct drm_dp_aux *aux) -{ -return 0 ; -} - -static inline void drm_dp_aux_unregister_devnode (struct drm_dp_aux *aux) -{ -} -#endif -/* drm_probe_helper.c */ enum drm_mode_status drm_crtc_mode_valid (struct drm_crtc *crtc,const struct drm_display_mode *mode);
drivers/gpu/drm/drm_dp_aux_dev.c +1 -1
@@ -40,7 +40,7 @@#include <drm/drm_dp_mst_helper.h> #include <drm/drm_print.h> -#include "drm_crtc_helper_internal.h" +#include "drm_dp_helper_internal.h" struct drm_dp_aux_dev {unsigned index;
drivers/gpu/drm/drm_dp_helper.c +1 -1
@@ -35,7 +35,7 @@#include <drm/drm_dp_mst_helper.h> #include <drm/drm_panel.h> -#include "drm_crtc_helper_internal.h" +#include "drm_dp_helper_internal.h" struct dp_aux_backlight {struct backlight_device *base;
drivers/gpu/drm/drm_dp_helper_internal.h new file +33 -0
@@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: MIT */ + +#ifndef DRM_DP_HELPER_INTERNAL_H +#define DRM_DP_HELPER_INTERNAL_H + +struct drm_dp_aux ; + +#ifdef CONFIG_DRM_DP_AUX_CHARDEV +int drm_dp_aux_dev_init (void ); +void drm_dp_aux_dev_exit (void ); +int drm_dp_aux_register_devnode (struct drm_dp_aux *aux); +void drm_dp_aux_unregister_devnode (struct drm_dp_aux *aux); +#else +static inline int drm_dp_aux_dev_init (void ) +{ +return 0 ; +} + +static inline void drm_dp_aux_dev_exit (void ) +{ +} + +static inline int drm_dp_aux_register_devnode (struct drm_dp_aux *aux) +{ +return 0 ; +} + +static inline void drm_dp_aux_unregister_devnode (struct drm_dp_aux *aux) +{ +} +#endif + +#endif
drivers/gpu/drm/drm_dp_mst_topology.c +1 -1
@@ -45,7 +45,7 @@#include <drm/drm_print.h> #include <drm/drm_probe_helper.h> -#include "drm_crtc_helper_internal.h" +#include "drm_dp_helper_internal.h" #include "drm_dp_mst_topology_internal.h" /**
drivers/gpu/drm/drm_kms_helper_common.c +1 -0
@@ -29,6 +29,7 @@#include <drm/drm_print.h> +#include "drm_dp_helper_internal.h" #include "drm_crtc_helper_internal.h" MODULE_AUTHOR ("David Airlie, Jesse Barnes" );
Signature · 1 line
2.34.1
Thomas Zimmermann
maintainerPATCH v3 3/5 drm/dp: Move DisplayPort helpers into separate helper module
In reply to Thomas ZimmermannMove DisplayPort functions into a separate module to reduce the size of the KMS helpers. Select DRM_DP_HELPER for all users of the code. To avoid naming conflicts, rename drm_dp_helper.c to drm_dp.c
This change can help to reduce the size of the kernel binary. Some numbers from a x86-64 test build:
Before:
drm_kms_helper.ko: 447480 bytes
After:
drm_dp_helper.ko: 216632 bytes drm_kms_helper.ko: 239424 bytes
For early-boot graphics, generic DRM drivers, such as simpledrm, require DRM KMS helpers to be built into the kernel. Generic helper functions for DisplayPort take up a significant portion of DRM KMS helper library. These functions are not used by generic drivers and can be loaded as a module.
v3:
* fix include statement in DRM selftests
v2:
* move DP helper code into dp/ (Jani)
---
drivers/gpu/drm/Kconfig | 8 +++++++
drivers/gpu/drm/Makefile | 10 ++++-----
drivers/gpu/drm/bridge/Kconfig | 4 ++++
drivers/gpu/drm/bridge/analogix/Kconfig | 2 ++
drivers/gpu/drm/bridge/cadence/Kconfig | 1 +
drivers/gpu/drm/dp/Makefile | 7 ++++++
.../gpu/drm/{drm_dp_helper.c => dp/drm_dp.c} | 0
drivers/gpu/drm/{ => dp}/drm_dp_aux_dev.c | 0
drivers/gpu/drm/{ => dp}/drm_dp_cec.c | 0
.../drm/{ => dp}/drm_dp_dual_mode_helper.c | 0
.../gpu/drm/{ => dp}/drm_dp_helper_internal.h | 0
drivers/gpu/drm/dp/drm_dp_helper_mod.c | 22 +++++++++++++++++++
.../gpu/drm/{ => dp}/drm_dp_mst_topology.c | 0
.../{ => dp}/drm_dp_mst_topology_internal.h | 0
drivers/gpu/drm/drm_kms_helper_common.c | 15 -------------
drivers/gpu/drm/i915/Kconfig | 1 +
drivers/gpu/drm/msm/Kconfig | 1 +
drivers/gpu/drm/nouveau/Kconfig | 1 +
drivers/gpu/drm/rockchip/Kconfig | 1 +
.../drm/selftests/test-drm_dp_mst_helper.c | 2 +-
drivers/gpu/drm/tegra/Kconfig | 1 +
drivers/gpu/drm/xlnx/Kconfig | 1 +
22 files changed, 55 insertions(+), 22 deletions(-)
create mode 100644 drivers/gpu/drm/dp/Makefile
rename drivers/gpu/drm/{drm_dp_helper.c => dp/drm_dp.c} (100%)
rename drivers/gpu/drm/{ => dp}/drm_dp_aux_dev.c (100%)
rename drivers/gpu/drm/{ => dp}/drm_dp_cec.c (100%)
rename drivers/gpu/drm/{ => dp}/drm_dp_dual_mode_helper.c (100%)
rename drivers/gpu/drm/{ => dp}/drm_dp_helper_internal.h (100%)
create mode 100644 drivers/gpu/drm/dp/drm_dp_helper_mod.c
rename drivers/gpu/drm/{ => dp}/drm_dp_mst_topology.c (100%)
rename drivers/gpu/drm/{ => dp}/drm_dp_mst_topology_internal.h (100%)drivers/gpu/drm/Kconfig +8 -0
@@ -80,6 +80,12 @@ config DRM_DEBUG_SELFTEST If in doubt, say "N". +config DRM_DP_HELPER + tristate + depends on DRM + help + DRM helpers for DisplayPort. + config DRM_KMS_HELPER tristate depends on DRM
@@ -236,6 +242,7 @@ config DRM_RADEON depends on DRM && PCI && MMU depends on AGP || !AGP select FW_LOADER + select DRM_DP_HELPER select DRM_KMS_HELPER select DRM_TTM select DRM_TTM_HELPER
@@ -256,6 +263,7 @@ config DRM_AMDGPU tristate "AMD GPU" depends on DRM && PCI && MMU select FW_LOADER + select DRM_DP_HELPER select DRM_KMS_HELPER select DRM_SCHED select DRM_TTM
drivers/gpu/drm/Makefile +4 -6
@@ -48,21 +48,18 @@ obj-$(CONFIG_DRM_VRAM_HELPER) += drm_vram_helper.o drm_ttm_helper-y := drm_gem_ttm_helper.o obj-$(CONFIG_DRM_TTM_HELPER) += drm_ttm_helper.o -drm_kms_helper-y := drm_bridge_connector.o drm_crtc_helper.o drm_dp_helper.o \ +drm_kms_helper-y := drm_bridge_connector.o drm_crtc_helper.o \ drm_dsc.o drm_encoder_slave.o drm_flip_work.o drm_hdcp.o \ drm_probe_helper.o \ - drm_plane_helper.o drm_dp_mst_topology.o drm_atomic_helper.o \ - drm_kms_helper_common.o drm_dp_dual_mode_helper.o \ + drm_plane_helper.o drm_atomic_helper.o \ + drm_kms_helper_common.o \ drm_simple_kms_helper.o drm_modeset_helper.o \ drm_scdc_helper.o drm_gem_atomic_helper.o \ drm_gem_framebuffer_helper.o \ drm_atomic_state_helper.o drm_damage_helper.o \ drm_format_helper.o drm_self_refresh_helper.o drm_rect.o - drm_kms_helper-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o -drm_kms_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o -drm_kms_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o obj-$(CONFIG_DRM_DEBUG_SELFTEST) += selftests/
@@ -72,6 +69,7 @@ obj-$(CONFIG_DRM_MIPI_DBI) += drm_mipi_dbi.o obj-$(CONFIG_DRM_MIPI_DSI) += drm_mipi_dsi.o obj-$(CONFIG_DRM_PANEL_ORIENTATION_QUIRKS) += drm_panel_orientation_quirks.o obj-y += arm/ +obj-y += dp/ obj-$(CONFIG_DRM_TTM) += ttm/ obj-$(CONFIG_DRM_SCHED) += scheduler/ obj-$(CONFIG_DRM_TDFX) += tdfx/
drivers/gpu/drm/bridge/Kconfig +4 -0
@@ -183,6 +183,7 @@ config DRM_PARADE_PS8640 tristate "Parade PS8640 MIPI DSI to eDP Converter" depends on OF select DRM_DP_AUX_BUS + select DRM_DP_HELPER select DRM_KMS_HELPER select DRM_MIPI_DSI select DRM_PANEL
@@ -253,6 +254,7 @@ config DRM_TOSHIBA_TC358764 config DRM_TOSHIBA_TC358767 tristate "Toshiba TC358767 eDP bridge" depends on OF + select DRM_DP_HELPER select DRM_KMS_HELPER select REGMAP_I2C select DRM_PANEL
@@ -272,6 +274,7 @@ config DRM_TOSHIBA_TC358768 config DRM_TOSHIBA_TC358775 tristate "Toshiba TC358775 DSI/LVDS bridge" depends on OF + select DRM_DP_HELPER select DRM_KMS_HELPER select REGMAP_I2C select DRM_PANEL
@@ -299,6 +302,7 @@ config DRM_TI_SN65DSI83 config DRM_TI_SN65DSI86 tristate "TI SN65DSI86 DSI to eDP bridge" depends on OF + select DRM_DP_HELPER select DRM_KMS_HELPER select REGMAP_I2C select DRM_PANEL
drivers/gpu/drm/bridge/analogix/Kconfig +2 -0
@@ -3,6 +3,7 @@ config DRM_ANALOGIX_ANX6345 tristate "Analogix ANX6345 bridge" depends on OF select DRM_ANALOGIX_DP + select DRM_DP_HELPER select DRM_KMS_HELPER select REGMAP_I2C help
@@ -14,6 +15,7 @@ config DRM_ANALOGIX_ANX6345 config DRM_ANALOGIX_ANX78XX tristate "Analogix ANX78XX bridge" select DRM_ANALOGIX_DP + select DRM_DP_HELPER select DRM_KMS_HELPER select REGMAP_I2C help
drivers/gpu/drm/bridge/cadence/Kconfig +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config DRM_CDNS_MHDP8546 tristate "Cadence DPI/DP bridge" + select DRM_DP_HELPER select DRM_KMS_HELPER select DRM_PANEL_BRIDGE depends on OF
drivers/gpu/drm/dp/Makefile new file +7 -0
@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: MIT + +drm_dp_helper-y := drm_dp.o drm_dp_dual_mode_helper.o drm_dp_helper_mod.o drm_dp_mst_topology.o +drm_dp_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o +drm_dp_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o + +obj-$(CONFIG_DRM_DP_HELPER) += drm_dp_helper.o
drivers/gpu/drm/dp/drm_dp.c renamed from drivers/gpu/drm/drm_dp_helper.c +0 -0
drivers/gpu/drm/dp/drm_dp_aux_dev.c renamed from drivers/gpu/drm/drm_dp_aux_dev.c +0 -0
drivers/gpu/drm/dp/drm_dp_cec.c renamed from drivers/gpu/drm/drm_dp_cec.c +0 -0
drivers/gpu/drm/dp/drm_dp_dual_mode_helper.c renamed from drivers/gpu/drm/drm_dp_dual_mode_helper.c +0 -0
drivers/gpu/drm/dp/drm_dp_helper_internal.h renamed from drivers/gpu/drm/drm_dp_helper_internal.h +0 -0
drivers/gpu/drm/dp/drm_dp_helper_mod.c new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: MIT + +#include <linux/module.h> + +#include "drm_dp_helper_internal.h" + +MODULE_DESCRIPTION ("DRM DisplayPort helper" ); +MODULE_LICENSE ("GPL and additional rights" ); + +static int __init drm_dp_helper_module_init (void ) +{ +return drm_dp_aux_dev_init (); +} + +static void __exit drm_dp_helper_module_exit(void) +{ +/* Call exit functions from specific dp helpers here */ +drm_dp_aux_dev_exit (); +} + +module_init (drm_dp_helper_module_init); +module_exit (drm_dp_helper_module_exit);
drivers/gpu/drm/dp/drm_dp_mst_topology.c renamed from drivers/gpu/drm/drm_dp_mst_topology.c +0 -0
drivers/gpu/drm/dp/drm_dp_mst_topology_internal.h renamed from drivers/gpu/drm/drm_dp_mst_topology_internal.h +0 -0
drivers/gpu/drm/drm_kms_helper_common.c +0 -15
@@ -29,7 +29,6 @@#include <drm/drm_print.h> -#include "drm_dp_helper_internal.h" #include "drm_crtc_helper_internal.h" MODULE_AUTHOR ("David Airlie, Jesse Barnes" );
@@ -62,17 +61,3 @@ MODULE_PARM_DESC(edid_firmware, "DEPRECATED. Use drm.edid_firmware module parameter instead.");#endif - -static int __init drm_kms_helper_init (void ) -{ -return drm_dp_aux_dev_init (); -} - -static void __exit drm_kms_helper_exit(void) -{ -/* Call exit functions from specific kms helpers here */ -drm_dp_aux_dev_exit (); -} - -module_init (drm_kms_helper_init); -module_exit (drm_kms_helper_exit);
drivers/gpu/drm/i915/Kconfig +1 -0
@@ -9,6 +9,7 @@ config DRM_I915 # the shmem_readpage() which depends upon tmpfs select SHMEM select TMPFS + select DRM_DP_HELPER select DRM_KMS_HELPER select DRM_PANEL select DRM_MIPI_DSI
drivers/gpu/drm/msm/Kconfig +1 -0
@@ -12,6 +12,7 @@ config DRM_MSM select IOMMU_IO_PGTABLE select QCOM_MDT_LOADER if ARCH_QCOM select REGULATOR + select DRM_DP_HELPER select DRM_KMS_HELPER select DRM_PANEL select DRM_BRIDGE
drivers/gpu/drm/nouveau/Kconfig +1 -0
@@ -4,6 +4,7 @@ config DRM_NOUVEAU depends on DRM && PCI && MMU select IOMMU_API select FW_LOADER + select DRM_DP_HELPER select DRM_KMS_HELPER select DRM_TTM select DRM_TTM_HELPER
drivers/gpu/drm/rockchip/Kconfig +1 -0
@@ -2,6 +2,7 @@ config DRM_ROCKCHIP tristate "DRM Support for Rockchip" depends on DRM && ROCKCHIP_IOMMU + select DRM_DP_HELPER select DRM_GEM_CMA_HELPER select DRM_KMS_HELPER select DRM_PANEL
drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c +1 -1
@@ -10,7 +10,7 @@#include <drm/drm_dp_mst_helper.h> #include <drm/drm_print.h> -#include "../drm_dp_mst_topology_internal.h" +#include "../dp/drm_dp_mst_topology_internal.h" #include "test-drm_modeset_common.h" int igt_dp_mst_calc_pbn_mode (void *ignored)
drivers/gpu/drm/tegra/Kconfig +1 -0
@@ -5,6 +5,7 @@ config DRM_TEGRA depends on COMMON_CLK depends on DRM depends on OF + select DRM_DP_HELPER select DRM_KMS_HELPER select DRM_MIPI_DSI select DRM_PANEL
drivers/gpu/drm/xlnx/Kconfig +1 -0
@@ -6,6 +6,7 @@ config DRM_ZYNQMP_DPSUB depends on PHY_XILINX_ZYNQMP depends on XILINX_ZYNQMP_DPDMA select DMA_ENGINE + select DRM_DP_HELPER select DRM_GEM_CMA_HELPER select DRM_KMS_HELPER select GENERIC_PHY
Signature · 1 line
2.34.1
Thomas Zimmermann
maintainerPATCH v3 4/5 drm/dp: Move public DisplayPort headers into dp/
In reply to Thomas ZimmermannMove all public DisplayPort headers into dp/ and update users. No functional changes.
v3:
* rebased onto latest drm-tip
---
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 ++--
drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 2 +-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 +-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 ++--
drivers/gpu/drm/amd/display/dc/core/dc_link_dpcd.c | 2 +-
drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 2 +-
drivers/gpu/drm/amd/display/dc/os_types.h | 2 +-
drivers/gpu/drm/amd/display/include/dpcd_defs.h | 2 +-
drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 2 +-
drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c | 2 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 2 +-
drivers/gpu/drm/bridge/analogix/anx7625.c | 2 +-
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 2 +-
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/parade-ps8640.c | 2 +-
drivers/gpu/drm/bridge/tc358767.c | 2 +-
drivers/gpu/drm/bridge/tc358775.c | 2 +-
drivers/gpu/drm/bridge/ti-sn65dsi86.c | 2 +-
drivers/gpu/drm/dp/drm_dp.c | 4 ++--
drivers/gpu/drm/dp/drm_dp_aux_dev.c | 4 ++--
drivers/gpu/drm/dp/drm_dp_cec.c | 2 +-
drivers/gpu/drm/dp/drm_dp_dual_mode_helper.c | 2 +-
drivers/gpu/drm/dp/drm_dp_mst_topology.c | 2 +-
drivers/gpu/drm/dp/drm_dp_mst_topology_internal.h | 2 +-
drivers/gpu/drm/drm_dp_aux_bus.c | 2 +-
drivers/gpu/drm/drm_dsc.c | 2 +-
drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +-
drivers/gpu/drm/gma500/intel_bios.c | 2 +-
drivers/gpu/drm/i915/display/intel_bios.c | 2 +-
drivers/gpu/drm/i915/display/intel_display.c | 2 +-
drivers/gpu/drm/i915/display/intel_display_types.h | 4 ++--
drivers/gpu/drm/i915/display/intel_dp.c | 2 +-
drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 4 ++--
drivers/gpu/drm/i915/display/intel_dp_link_training.h | 2 +-
drivers/gpu/drm/i915/display/intel_lspcon.c | 2 +-
drivers/gpu/drm/msm/dp/dp_audio.c | 2 +-
drivers/gpu/drm/msm/dp/dp_aux.h | 2 +-
drivers/gpu/drm/msm/dp/dp_catalog.c | 2 +-
drivers/gpu/drm/msm/dp/dp_ctrl.c | 2 +-
drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_connector.h | 2 +-
drivers/gpu/drm/nouveau/nouveau_dp.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_encoder.h | 4 ++--
drivers/gpu/drm/panel/panel-edp.c | 2 +-
drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | 2 +-
drivers/gpu/drm/radeon/atombios_dp.c | 2 +-
drivers/gpu/drm/radeon/radeon_connectors.c | 2 +-
drivers/gpu/drm/radeon/radeon_dp_mst.c | 2 +-
drivers/gpu/drm/radeon/radeon_mode.h | 4 ++--
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 2 +-
drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +-
drivers/gpu/drm/rockchip/cdn-dp-core.h | 2 +-
drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +-
drivers/gpu/drm/rockchip/rockchip_rgb.c | 2 +-
drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c | 2 +-
drivers/gpu/drm/tegra/dp.c | 2 +-
drivers/gpu/drm/tegra/dpaux.c | 2 +-
drivers/gpu/drm/tegra/sor.c | 2 +-
drivers/gpu/drm/xlnx/zynqmp_dp.c | 2 +-
include/drm/{ => dp}/drm_dp_dual_mode_helper.h | 0
include/drm/{ => dp}/drm_dp_helper.h | 0
include/drm/{ => dp}/drm_dp_mst_helper.h | 2 +-
include/drm/drm_dsc.h | 2 +-
67 files changed, 73 insertions(+), 73 deletions(-)
rename include/drm/{ => dp}/drm_dp_dual_mode_helper.h (100%)
rename include/drm/{ => dp}/drm_dp_helper.h (100%)
rename include/drm/{ => dp}/drm_dp_mst_helper.h (99%)drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +1 -1
@@ -26,7 +26,7 @@#include <drm/drm_edid.h> #include <drm/drm_fb_helper.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_probe_helper.h> #include <drm/amdgpu_drm.h> #include "amdgpu.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +2 -2
@@ -33,7 +33,7 @@#include <drm/drm_crtc.h> #include <drm/drm_edid.h> #include <drm/drm_encoder.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_fixed.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_fb_helper.h>
@@ -44,7 +44,7 @@#include <linux/hrtimer.h> #include "amdgpu_irq.h" -#include <drm/drm_dp_mst_helper.h> +#include <drm/dp/drm_dp_mst_helper.h> #include "modules/inc/mod_freesync.h" #include "amdgpu_dm_irq_params.h"
drivers/gpu/drm/amd/amdgpu/atombios_dp.c +1 -1
@@ -34,7 +34,7 @@#include "atombios_dp.h" #include "amdgpu_connectors.h" #include "amdgpu_atombios.h" -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> /* move these to drm_dp_helper.c/h */ #define DP_LINK_CONFIGURATION_SIZE 9
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -1
@@ -76,7 +76,7 @@#include <drm/drm_atomic.h> #include <drm/drm_atomic_uapi.h> #include <drm/drm_atomic_helper.h> -#include <drm/drm_dp_mst_helper.h> +#include <drm/dp/drm_dp_mst_helper.h> #include <drm/drm_fb_helper.h> #include <drm/drm_fourcc.h> #include <drm/drm_edid.h>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +1 -1
@@ -29,7 +29,7 @@#include <drm/drm_atomic.h> #include <drm/drm_connector.h> #include <drm/drm_crtc.h> -#include <drm/drm_dp_mst_helper.h> +#include <drm/dp/drm_dp_mst_helper.h> #include <drm/drm_plane.h> /*
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +2 -2
@@ -25,8 +25,8 @@#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> -#include <drm/drm_dp_mst_helper.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_mst_helper.h> +#include <drm/dp/drm_dp_helper.h> #include "dm_services.h" #include "amdgpu.h" #include "amdgpu_dm.h"
drivers/gpu/drm/amd/display/dc/core/dc_link_dpcd.c +1 -1
@@ -27,7 +27,7 @@#include <dc_link.h> #include <inc/link_hwss.h> #include <inc/link_dpcd.h> -#include "drm/drm_dp_helper.h" +#include <drm/dp/drm_dp_helper.h> #include <dc_dp_types.h> #include "dm_helpers.h"
drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c +1 -1
@@ -25,7 +25,7 @@#include <drm/drm_dsc.h> #include "dc_hw_types.h" #include "dsc.h" -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include "dc.h" #include "rc_calc.h" #include "fixed31_32.h"
drivers/gpu/drm/amd/display/dc/os_types.h +1 -1
@@ -36,7 +36,7 @@#include <asm/byteorder.h> #include <drm/drm_print.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include "cgs_common.h"
drivers/gpu/drm/amd/display/include/dpcd_defs.h +1 -1
@@ -26,7 +26,7 @@#ifndef __DAL_DPCD_DEFS_H__#define __DAL_DPCD_DEFS_H__ -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #ifndef DP_SINK_HW_REVISION_START // can remove this once the define gets into linux drm_dp_helper.h #define DP_SINK_HW_REVISION_START 0x409#endif
drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h +1 -1
@@ -30,7 +30,7 @@#include "hdcp_log.h" #include <drm/drm_hdcp.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> enum mod_hdcp_trans_input_result {UNKNOWN =0 ,
drivers/gpu/drm/bridge/analogix/analogix-anx6345.c +1 -1
@@ -22,7 +22,7 @@#include <drm/drm_bridge.h> #include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_edid.h> #include <drm/drm_of.h> #include <drm/drm_panel.h>
drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c +1 -1
@@ -21,7 +21,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_crtc.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_edid.h> #include <drm/drm_print.h> #include <drm/drm_probe_helper.h>
drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c +1 -1
@@ -8,7 +8,7 @@#include <linux/regmap.h> #include <drm/drm.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_print.h> #include "analogix-i2c-dptx.h"
drivers/gpu/drm/bridge/analogix/analogix_dp_core.h +1 -1
@@ -10,7 +10,7 @@#define _ANALOGIX_DP_CORE_H#include <drm/drm_crtc.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #define DP_TIMEOUT_LOOP_COUNT 100#define MAX_CR_LOOP 5
drivers/gpu/drm/bridge/analogix/anx7625.c +1 -1
@@ -24,7 +24,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_crtc_helper.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_edid.h> #include <drm/drm_mipi_dsi.h> #include <drm/drm_of.h>
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c +1 -1
@@ -41,7 +41,7 @@#include <drm/drm_bridge.h> #include <drm/drm_connector.h> #include <drm/drm_crtc_helper.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_hdcp.h> #include <drm/drm_modeset_helper_vtables.h> #include <drm/drm_print.h>
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.h +1 -1
@@ -17,7 +17,7 @@#include <drm/drm_bridge.h> #include <drm/drm_connector.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> struct clk ;struct device ;
drivers/gpu/drm/bridge/parade-ps8640.c +1 -1
@@ -15,7 +15,7 @@#include <drm/drm_bridge.h> #include <drm/drm_dp_aux_bus.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_mipi_dsi.h> #include <drm/drm_of.h> #include <drm/drm_panel.h>
drivers/gpu/drm/bridge/tc358767.c +1 -1
@@ -27,7 +27,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_edid.h> #include <drm/drm_of.h> #include <drm/drm_panel.h>
drivers/gpu/drm/bridge/tc358775.c +1 -1
@@ -22,7 +22,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_crtc_helper.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_mipi_dsi.h> #include <drm/drm_of.h> #include <drm/drm_panel.h>
drivers/gpu/drm/bridge/ti-sn65dsi86.c +1 -1
@@ -27,7 +27,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_dp_aux_bus.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_mipi_dsi.h> #include <drm/drm_of.h> #include <drm/drm_panel.h>
drivers/gpu/drm/dp/drm_dp.c +2 -2
@@ -29,10 +29,10 @@#include <linux/sched.h> #include <linux/seq_file.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_print.h> #include <drm/drm_vblank.h> -#include <drm/drm_dp_mst_helper.h> +#include <drm/dp/drm_dp_mst_helper.h> #include <drm/drm_panel.h> #include "drm_dp_helper_internal.h"
drivers/gpu/drm/dp/drm_dp_aux_dev.c +2 -2
@@ -36,8 +36,8 @@#include <linux/uio.h> #include <drm/drm_crtc.h> -#include <drm/drm_dp_helper.h> -#include <drm/drm_dp_mst_helper.h> +#include <drm/dp/drm_dp_helper.h> +#include <drm/dp/drm_dp_mst_helper.h> #include <drm/drm_print.h> #include "drm_dp_helper_internal.h"
drivers/gpu/drm/dp/drm_dp_cec.c +1 -1
@@ -13,7 +13,7 @@#include <drm/drm_connector.h> #include <drm/drm_device.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> /* * Unfortunately it turns out that we have a chicken-and-egg situation
drivers/gpu/drm/dp/drm_dp_dual_mode_helper.c +1 -1
@@ -28,7 +28,7 @@#include <linux/string.h> #include <drm/drm_device.h> -#include <drm/drm_dp_dual_mode_helper.h> +#include <drm/dp/drm_dp_dual_mode_helper.h> #include <drm/drm_print.h> /**
drivers/gpu/drm/dp/drm_dp_mst_topology.c +1 -1
@@ -40,7 +40,7 @@#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> -#include <drm/drm_dp_mst_helper.h> +#include <drm/dp/drm_dp_mst_helper.h> #include <drm/drm_drv.h> #include <drm/drm_print.h> #include <drm/drm_probe_helper.h>
drivers/gpu/drm/dp/drm_dp_mst_topology_internal.h +1 -1
@@ -10,7 +10,7 @@#ifndef _DRM_DP_MST_HELPER_INTERNAL_H_#define _DRM_DP_MST_HELPER_INTERNAL_H_ -#include <drm/drm_dp_mst_helper.h> +#include <drm/dp/drm_dp_mst_helper.h> void drm_dp_encode_sideband_req(const struct drm_dp_sideband_msg_req_body *req,
drivers/gpu/drm/drm_dp_aux_bus.c +1 -1
@@ -20,7 +20,7 @@#include <linux/pm_runtime.h> #include <drm/drm_dp_aux_bus.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> /** * dp_aux_ep_match() - The match function for the dp_aux_bus.
drivers/gpu/drm/drm_dsc.c +1 -1
@@ -12,7 +12,7 @@#include <linux/errno.h> #include <linux/byteorder/generic.h> #include <drm/drm_print.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_dsc.h> /**
drivers/gpu/drm/gma500/cdv_intel_dp.c +1 -1
@@ -31,7 +31,7 @@#include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_simple_kms_helper.h> #include "gma_display.h"
drivers/gpu/drm/gma500/intel_bios.c +1 -1
@@ -6,7 +6,7 @@* Eric Anholt <[email protected]> */ #include <drm/drm.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include "intel_bios.h" #include "psb_drv.h"
drivers/gpu/drm/i915/display/intel_bios.c +1 -1
@@ -25,7 +25,7 @@* */ -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include "display/intel_display.h" #include "display/intel_display_types.h"
drivers/gpu/drm/i915/display/intel_display.c +1 -1
@@ -38,7 +38,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_uapi.h> #include <drm/drm_damage_helper.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_edid.h> #include <drm/drm_fourcc.h> #include <drm/drm_plane_helper.h>
drivers/gpu/drm/i915/display/intel_display_types.h +2 -2
@@ -34,8 +34,8 @@#include <drm/drm_atomic.h> #include <drm/drm_crtc.h> -#include <drm/drm_dp_dual_mode_helper.h> -#include <drm/drm_dp_mst_helper.h> +#include <drm/dp/drm_dp_dual_mode_helper.h> +#include <drm/dp/drm_dp_mst_helper.h> #include <drm/drm_dsc.h> #include <drm/drm_encoder.h> #include <drm/drm_fb_helper.h>
drivers/gpu/drm/i915/display/intel_dp.c +1 -1
@@ -36,7 +36,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_edid.h> #include <drm/drm_probe_helper.h>
drivers/gpu/drm/i915/display/intel_dp_hdcp.c +2 -2
@@ -6,8 +6,8 @@* Sean Paul <[email protected]> */ -#include <drm/drm_dp_helper.h> -#include <drm/drm_dp_mst_helper.h> +#include <drm/dp/drm_dp_helper.h> +#include <drm/dp/drm_dp_mst_helper.h> #include <drm/drm_hdcp.h> #include <drm/drm_print.h>
drivers/gpu/drm/i915/display/intel_dp_link_training.h +1 -1
@@ -6,7 +6,7 @@#ifndef __INTEL_DP_LINK_TRAINING_H__#define __INTEL_DP_LINK_TRAINING_H__ -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> struct intel_crtc_state ;struct intel_dp ;
drivers/gpu/drm/i915/display/intel_lspcon.c +1 -1
@@ -24,7 +24,7 @@*/ #include <drm/drm_atomic_helper.h> -#include <drm/drm_dp_dual_mode_helper.h> +#include <drm/dp/drm_dp_dual_mode_helper.h> #include <drm/drm_edid.h> #include "intel_de.h"
drivers/gpu/drm/msm/dp/dp_audio.c +1 -1
@@ -8,7 +8,7 @@#include <linux/of_platform.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_edid.h> #include "dp_catalog.h"
drivers/gpu/drm/msm/dp/dp_aux.h +1 -1
@@ -7,7 +7,7 @@#define _DP_AUX_H_#include "dp_catalog.h" -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> int dp_aux_register (struct drm_dp_aux *dp_aux);void dp_aux_unregister (struct drm_dp_aux *dp_aux);
drivers/gpu/drm/msm/dp/dp_catalog.c +1 -1
@@ -10,7 +10,7 @@#include <linux/phy/phy.h> #include <linux/phy/phy-dp.h> #include <linux/rational.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_print.h> #include "dp_catalog.h"
drivers/gpu/drm/msm/dp/dp_ctrl.c +1 -1
@@ -12,7 +12,7 @@#include <linux/phy/phy-dp.h> #include <linux/pm_opp.h> #include <drm/drm_fixed.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_print.h> #include "dp_reg.h"
drivers/gpu/drm/nouveau/dispnv50/disp.c +1 -1
@@ -35,7 +35,7 @@#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_edid.h> #include <drm/drm_fb_helper.h> #include <drm/drm_plane_helper.h>
drivers/gpu/drm/nouveau/nouveau_connector.h +1 -1
@@ -36,7 +36,7 @@#include <drm/drm_crtc.h> #include <drm/drm_edid.h> #include <drm/drm_encoder.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_util.h> #include "nouveau_crtc.h"
drivers/gpu/drm/nouveau/nouveau_dp.c +1 -1
@@ -22,7 +22,7 @@* Authors: Ben Skeggs */ -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include "nouveau_drv.h" #include "nouveau_connector.h"
drivers/gpu/drm/nouveau/nouveau_encoder.h +2 -2
@@ -30,8 +30,8 @@#include <subdev/bios/dcb.h> #include <drm/drm_encoder_slave.h> -#include <drm/drm_dp_helper.h> -#include <drm/drm_dp_mst_helper.h> +#include <drm/dp/drm_dp_helper.h> +#include <drm/dp/drm_dp_mst_helper.h> #include "dispnv04/disp.h" struct nv50_head_atom ;struct nouveau_connector ;
drivers/gpu/drm/panel/panel-edp.c +1 -1
@@ -37,7 +37,7 @@#include <drm/drm_crtc.h> #include <drm/drm_device.h> #include <drm/drm_dp_aux_bus.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_panel.h> /**
drivers/gpu/drm/panel/panel-samsung-atna33xc20.c +1 -1
@@ -15,7 +15,7 @@#include <linux/regulator/consumer.h> #include <drm/drm_dp_aux_bus.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_edid.h> #include <drm/drm_panel.h>
drivers/gpu/drm/radeon/atombios_dp.c +1 -1
@@ -30,7 +30,7 @@#include "atom.h" #include "atom-bits.h" -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> /* move these to drm_dp_helper.c/h */ #define DP_LINK_CONFIGURATION_SIZE 9
drivers/gpu/drm/radeon/radeon_connectors.c +1 -1
@@ -27,7 +27,7 @@#include <drm/drm_edid.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_fb_helper.h> -#include <drm/drm_dp_mst_helper.h> +#include <drm/dp/drm_dp_mst_helper.h> #include <drm/drm_probe_helper.h> #include <drm/radeon_drm.h> #include "radeon.h"
drivers/gpu/drm/radeon/radeon_dp_mst.c +1 -1
@@ -1,6 +1,6 @@// SPDX-License-Identifier: MIT -#include <drm/drm_dp_mst_helper.h> +#include <drm/dp/drm_dp_mst_helper.h> #include <drm/drm_fb_helper.h> #include <drm/drm_file.h> #include <drm/drm_probe_helper.h>
drivers/gpu/drm/radeon/radeon_mode.h +2 -2
@@ -33,8 +33,8 @@#include <drm/drm_crtc.h> #include <drm/drm_edid.h> #include <drm/drm_encoder.h> -#include <drm/drm_dp_helper.h> -#include <drm/drm_dp_mst_helper.h> +#include <drm/dp/drm_dp_helper.h> +#include <drm/dp/drm_dp_mst_helper.h> #include <drm/drm_fixed.h> #include <drm/drm_crtc_helper.h> #include <linux/i2c.h>
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +1 -1
@@ -22,7 +22,7 @@#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/bridge/analogix_dp.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_of.h> #include <drm/drm_panel.h> #include <drm/drm_probe_helper.h>
drivers/gpu/drm/rockchip/cdn-dp-core.c +1 -1
@@ -16,7 +16,7 @@#include <sound/hdmi-codec.h> #include <drm/drm_atomic_helper.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_edid.h> #include <drm/drm_of.h> #include <drm/drm_probe_helper.h>
drivers/gpu/drm/rockchip/cdn-dp-core.h +1 -1
@@ -7,7 +7,7 @@#ifndef _CDN_DP_CORE_H#define _CDN_DP_CORE_H -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_panel.h> #include <drm/drm_probe_helper.h>
drivers/gpu/drm/rockchip/rockchip_lvds.c +1 -1
@@ -20,7 +20,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_bridge_connector.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_of.h> #include <drm/drm_panel.h> #include <drm/drm_probe_helper.h>
drivers/gpu/drm/rockchip/rockchip_rgb.c +1 -1
@@ -11,7 +11,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_bridge_connector.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_of.h> #include <drm/drm_panel.h> #include <drm/drm_probe_helper.h>
drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c +1 -1
@@ -7,7 +7,7 @@#include <linux/random.h> -#include <drm/drm_dp_mst_helper.h> +#include <drm/dp/drm_dp_mst_helper.h> #include <drm/drm_print.h> #include "../dp/drm_dp_mst_topology_internal.h"
drivers/gpu/drm/tegra/dp.c +1 -1
@@ -5,7 +5,7 @@*/ #include <drm/drm_crtc.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_print.h> #include "dp.h"
drivers/gpu/drm/tegra/dpaux.c +1 -1
@@ -18,7 +18,7 @@#include <linux/reset.h> #include <linux/workqueue.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_panel.h> #include "dp.h"
drivers/gpu/drm/tegra/sor.c +1 -1
@@ -18,7 +18,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_debugfs.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_file.h> #include <drm/drm_panel.h> #include <drm/drm_scdc_helper.h>
drivers/gpu/drm/xlnx/zynqmp_dp.c +1 -1
@@ -13,7 +13,7 @@#include <drm/drm_connector.h> #include <drm/drm_crtc.h> #include <drm/drm_device.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_edid.h> #include <drm/drm_encoder.h> #include <drm/drm_managed.h>
include/drm/dp/drm_dp_dual_mode_helper.h renamed from include/drm/drm_dp_dual_mode_helper.h +0 -0
include/drm/dp/drm_dp_helper.h renamed from include/drm/drm_dp_helper.h +0 -0
include/drm/dp/drm_dp_mst_helper.h renamed from include/drm/drm_dp_mst_helper.h +1 -1
@@ -23,7 +23,7 @@#define _DRM_DP_MST_HELPER_H_#include <linux/types.h> -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> #include <drm/drm_atomic.h> #if IS_ENABLED (CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS )
include/drm/drm_dsc.h +1 -1
@@ -8,7 +8,7 @@#ifndef DRM_DSC_H_ #define DRM_DSC_H_ -#include <drm/drm_dp_helper.h> +#include <drm/dp/drm_dp_helper.h> /* VESA Display Stream Compression DSC 1.2 constants */ #define DSC_NUM_BUF_RANGES 15
Signature · 1 line
2.34.1
Thomas Zimmermann
maintainerPATCH v3 5/5 drm/dp: Move DisplayPort AUX bus helpers into dp/
In reply to Thomas ZimmermannMove drm_dp_aux_bus.c and its header file into the DP subdirectory and update all users. No functional changes.
---
drivers/gpu/drm/Makefile | 2 --
drivers/gpu/drm/bridge/parade-ps8640.c | 2 +-
drivers/gpu/drm/bridge/ti-sn65dsi86.c | 2 +-
drivers/gpu/drm/dp/Makefile | 2 ++
drivers/gpu/drm/{ => dp}/drm_dp_aux_bus.c | 2 +-
drivers/gpu/drm/panel/panel-edp.c | 2 +-
drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | 2 +-
include/drm/{ => dp}/drm_dp_aux_bus.h | 0
8 files changed, 7 insertions(+), 7 deletions(-)
rename drivers/gpu/drm/{ => dp}/drm_dp_aux_bus.c (99%)
rename include/drm/{ => dp}/drm_dp_aux_bus.h (100%)drivers/gpu/drm/Makefile +0 -2
@@ -31,8 +31,6 @@ drm-$(CONFIG_DEBUG_FS) += drm_debugfs.o drm_debugfs_crc.o drm-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o drm-$(CONFIG_DRM_PRIVACY_SCREEN) += drm_privacy_screen.o drm_privacy_screen_x86.o -obj-$(CONFIG_DRM_DP_AUX_BUS) += drm_dp_aux_bus.o - obj-$(CONFIG_DRM_NOMODESET) += drm_nomodeset.o drm_cma_helper-y := drm_gem_cma_helper.o
drivers/gpu/drm/bridge/parade-ps8640.c +1 -1
@@ -14,7 +14,7 @@#include <linux/regulator/consumer.h> #include <drm/drm_bridge.h> -#include <drm/drm_dp_aux_bus.h> +#include <drm/dp/drm_dp_aux_bus.h> #include <drm/dp/drm_dp_helper.h> #include <drm/drm_mipi_dsi.h> #include <drm/drm_of.h>
drivers/gpu/drm/bridge/ti-sn65dsi86.c +1 -1
@@ -26,7 +26,7 @@#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> -#include <drm/drm_dp_aux_bus.h> +#include <drm/dp/drm_dp_aux_bus.h> #include <drm/dp/drm_dp_helper.h> #include <drm/drm_mipi_dsi.h> #include <drm/drm_of.h>
drivers/gpu/drm/dp/Makefile +2 -0
@@ -1,5 +1,7 @@ # SPDX-License-Identifier: MIT +obj-$(CONFIG_DRM_DP_AUX_BUS) += drm_dp_aux_bus.o + drm_dp_helper-y := drm_dp.o drm_dp_dual_mode_helper.o drm_dp_helper_mod.o drm_dp_mst_topology.o drm_dp_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o drm_dp_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o
drivers/gpu/drm/dp/drm_dp_aux_bus.c renamed from drivers/gpu/drm/drm_dp_aux_bus.c +1 -1
@@ -19,7 +19,7 @@#include <linux/pm_domain.h> #include <linux/pm_runtime.h> -#include <drm/drm_dp_aux_bus.h> +#include <drm/dp/drm_dp_aux_bus.h> #include <drm/dp/drm_dp_helper.h> /**
drivers/gpu/drm/panel/panel-edp.c +1 -1
@@ -36,7 +36,7 @@#include <drm/drm_crtc.h> #include <drm/drm_device.h> -#include <drm/drm_dp_aux_bus.h> +#include <drm/dp/drm_dp_aux_bus.h> #include <drm/dp/drm_dp_helper.h> #include <drm/drm_panel.h>
drivers/gpu/drm/panel/panel-samsung-atna33xc20.c +1 -1
@@ -14,7 +14,7 @@#include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> -#include <drm/drm_dp_aux_bus.h> +#include <drm/dp/drm_dp_aux_bus.h> #include <drm/dp/drm_dp_helper.h> #include <drm/drm_edid.h> #include <drm/drm_panel.h>
include/drm/dp/drm_dp_aux_bus.h renamed from include/drm/drm_dp_aux_bus.h +0 -0
Signature · 1 line
2.34.1
Jani Nikula
maintainerQuoted 2 lines · Thomas Zimmermann
Split-off DisplayPort functions from KMS helper library and move them into their own module. Reduces the size of drm_kms_helper.ko by ~50%.
Sorry I failed to notice earlier, this breaks 'make htmldocs' build because Documentation/gpu/ has references to the old filenames:
Error: Cannot open file ./drivers/gpu/drm/drm_dp_helper.c
Error: Cannot open file ./include/drm/drm_dp_helper.h
Error: Cannot open file ./include/drm/drm_dp_helper.h
Error: Cannot open file ./drivers/gpu/drm/drm_dp_helper.c
Error: Cannot open file ./drivers/gpu/drm/drm_dp_helper.c
Error: Cannot open file ./drivers/gpu/drm/drm_dp_cec.c
Error: Cannot open file ./drivers/gpu/drm/drm_dp_cec.c
Error: Cannot open file ./drivers/gpu/drm/drm_dp_cec.c
Error: Cannot open file ./drivers/gpu/drm/drm_dp_dual_mode_helper.c
Error: Cannot open file ./include/drm/drm_dp_dual_mode_helper.h
Error: Cannot open file ./include/drm/drm_dp_dual_mode_helper.h
Error: Cannot open file ./drivers/gpu/drm/drm_dp_dual_mode_helper.c
Error: Cannot open file ./drivers/gpu/drm/drm_dp_dual_mode_helper.c
Error: Cannot open file ./drivers/gpu/drm/drm_dp_mst_topology.c
Error: Cannot open file ./drivers/gpu/drm/drm_dp_mst_topology.c
Error: Cannot open file ./include/drm/drm_dp_mst_helper.h
Error: Cannot open file ./include/drm/drm_dp_mst_helper.h
Error: Cannot open file ./drivers/gpu/drm/drm_dp_mst_topology.c
Error: Cannot open file ./drivers/gpu/drm/drm_dp_mst_topology.c
Error: Cannot open file ./drivers/gpu/drm/drm_dp_mst_topology.c
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Thomas Zimmermann
maintainerHi
Am 20.01.22 um 10:53 schrieb Jani Nikula:
Quoted 19 lines · Thomas Zimmermann
Quoted 2 lines
Split-off DisplayPort functions from KMS helper library and move them into their own module. Reduces the size of drm_kms_helper.ko by ~50%.
Sorry I failed to notice earlier, this breaks 'make htmldocs' build because
Documentation/gpu/has references to the old filenames:Error: Cannot open file
./drivers/gpu/drm/drm_dp_helper.c
Error: Cannot open file./include/drm/drm_dp_helper.h
Error: Cannot open file./include/drm/drm_dp_helper.h
Error: Cannot open file./drivers/gpu/drm/drm_dp_helper.c
Error: Cannot open file./drivers/gpu/drm/drm_dp_helper.c
Error: Cannot open file./drivers/gpu/drm/drm_dp_cec.c
Error: Cannot open file./drivers/gpu/drm/drm_dp_cec.c
Error: Cannot open file./drivers/gpu/drm/drm_dp_cec.c
Error: Cannot open file./drivers/gpu/drm/drm_dp_dual_mode_helper.c
Error: Cannot open file./include/drm/drm_dp_dual_mode_helper.h
Error: Cannot open file./include/drm/drm_dp_dual_mode_helper.h
Error: Cannot open file./drivers/gpu/drm/drm_dp_dual_mode_helper.c
Quoted 8 lines
Error: Cannot open file
./drivers/gpu/drm/drm_dp_dual_mode_helper.c
Error: Cannot open file./drivers/gpu/drm/drm_dp_mst_topology.c
Error: Cannot open file./drivers/gpu/drm/drm_dp_mst_topology.c
Error: Cannot open file./include/drm/drm_dp_mst_helper.h
Error: Cannot open file./include/drm/drm_dp_mst_helper.h
Error: Cannot open file./drivers/gpu/drm/drm_dp_mst_topology.c
Error: Cannot open file./drivers/gpu/drm/drm_dp_mst_topology.c
Error: Cannot open file./drivers/gpu/drm/drm_dp_mst_topology.c
Ah, sorry! I'll send a fix later today. Thanks for reporting.
Best regards
Thomas
Quoted 5 lines
BR,
Jani.
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Ivo Totev