drm: Introduce display-helper library
Subsystems (27)
Thomas Zimmermann
maintainerv2 cover drm: Introduce display-helper library
Move DisplayPort, HDMI and various other display helpers from KMS helpers into a new module. Adapt all drivers.
This patch is part of an on-going effort to reduce the minimum size of DRM when linked into the kernel binary. The helpers for various display and video-output standards are not required for minimal graphics output and can be moved into a separate module.
The DisplayPort code was already part of the DP module, which now forms the base of the display-helper module. Moving other helpers into the new module reduces KMS helpers by ~14 KiB (from 243 KiB to 229 KiB). More importantly, restructuring the code allows for a more fine-grained selection of helpers and dependencies.
Built on x86-64, i586, aarch64, and arm.
v2:
* reduce number of HDMI helpers (Jani)
* make individual helpers selectable via Kconfig
* fix several include statements
* minor cleanups
Thomas Zimmermann (8):
drm: Put related statements next to each other in Makefile
drm: Rename dp/ to display/
drm/display: Introduce a DRM display-helper module drm/display: Split DisplayPort header into core and helper drm/display: Move DSC header and helpers into display-helper module drm/display: Move HDCP helpers into display-helper module drm/display: Move HDMI helpers into display-helper module drm/display: Move SCDC helpers into display-helper library
Documentation/gpu/drm-kms-helpers.rst | 43 +-
drivers/gpu/drm/Kconfig | 41 +-
drivers/gpu/drm/Makefile | 29 +-
.../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 | 3 +-
drivers/gpu/drm/amd/display/Kconfig | 1 +
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 +-
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 +-
.../amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 2 +-
.../display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 +-
.../drm/amd/display/dc/core/dc_link_dpcd.c | 2 +-
.../gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 2 +
.../gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h | 2 +-
.../drm/amd/display/dc/dml/dsc/rc_calc_fpu.h | 2 +-
drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 4 +-
.../gpu/drm/amd/display/dc/dsc/dscc_types.h | 2 +-
.../gpu/drm/amd/display/dc/dsc/rc_calc_dpi.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 | 4 +-
drivers/gpu/drm/bridge/Kconfig | 16 +-
drivers/gpu/drm/bridge/analogix/Kconfig | 10 +-
.../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 | 6 +-
drivers/gpu/drm/bridge/cadence/Kconfig | 4 +-
.../drm/bridge/cadence/cdns-mhdp8546-core.c | 4 +-
.../drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
.../drm/bridge/cadence/cdns-mhdp8546-hdcp.c | 2 +-
drivers/gpu/drm/bridge/ite-it6505.c | 4 +-
drivers/gpu/drm/bridge/parade-ps8640.c | 4 +-
drivers/gpu/drm/bridge/synopsys/Kconfig | 2 +
drivers/gpu/drm/bridge/synopsys/dw-hdmi.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/display/Kconfig | 49 ++
drivers/gpu/drm/display/Makefile | 16 +
.../drm_display_helper_mod.c} | 10 +-
.../gpu/drm/{dp => display}/drm_dp_aux_bus.c | 4 +-
.../gpu/drm/{dp => display}/drm_dp_aux_dev.c | 4 +-
drivers/gpu/drm/{dp => display}/drm_dp_cec.c | 2 +-
.../{dp => display}/drm_dp_dual_mode_helper.c | 2 +-
.../{dp/drm_dp.c => display/drm_dp_helper.c} | 4 +-
.../{dp => display}/drm_dp_helper_internal.h | 0
.../drm/{dp => display}/drm_dp_mst_topology.c | 2 +-
.../drm_dp_mst_topology_internal.h | 2 +-
.../{drm_dsc.c => display/drm_dsc_helper.c} | 5 +-
.../{drm_hdcp.c => display/drm_hdcp_helper.c} | 4 +-
drivers/gpu/drm/display/drm_hdmi_helper.c | 199 +++++
.../gpu/drm/{ => display}/drm_scdc_helper.c | 3 +-
drivers/gpu/drm/dp/Makefile | 9 -
drivers/gpu/drm/drm_connector.c | 34 -
drivers/gpu/drm/drm_edid.c | 160 ----
drivers/gpu/drm/drm_mipi_dsi.c | 6 +-
drivers/gpu/drm/exynos/Kconfig | 3 +-
drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +-
drivers/gpu/drm/gma500/intel_bios.c | 3 +-
drivers/gpu/drm/i915/Kconfig | 5 +-
drivers/gpu/drm/i915/display/icl_dsi.c | 1 +
drivers/gpu/drm/i915/display/intel_bios.c | 3 +-
drivers/gpu/drm/i915/display/intel_ddi.c | 2 +-
drivers/gpu/drm/i915/display/intel_display.c | 2 +-
.../drm/i915/display/intel_display_types.h | 6 +-
drivers/gpu/drm/i915/display/intel_dp.c | 5 +-
drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 6 +-
.../drm/i915/display/intel_dp_link_training.h | 2 +-
drivers/gpu/drm/i915/display/intel_gmbus.c | 2 +-
drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +-
drivers/gpu/drm/i915/display/intel_hdmi.c | 5 +-
drivers/gpu/drm/i915/display/intel_lspcon.c | 4 +-
.../gpu/drm/i915/display/intel_qp_tables.c | 2 +-
drivers/gpu/drm/i915/display/intel_sdvo.c | 1 +
drivers/gpu/drm/i915/display/intel_vdsc.c | 2 +
drivers/gpu/drm/msm/Kconfig | 3 +-
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 | 3 +-
drivers/gpu/drm/msm/edp/edp.h | 3 +-
drivers/gpu/drm/msm/edp/edp_ctrl.c | 3 +-
drivers/gpu/drm/nouveau/Kconfig | 4 +-
drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +-
drivers/gpu/drm/nouveau/nouveau_connector.h | 2 +-
drivers/gpu/drm/nouveau/nouveau_dp.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_encoder.h | 6 +-
drivers/gpu/drm/panel/Kconfig | 3 +-
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 | 4 +-
.../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 | 4 +-
drivers/gpu/drm/tegra/dp.c | 2 +-
drivers/gpu/drm/tegra/dpaux.c | 4 +-
drivers/gpu/drm/tegra/sor.c | 4 +-
drivers/gpu/drm/vc4/Kconfig | 2 +
drivers/gpu/drm/vc4/vc4_hdmi.c | 4 +-
drivers/gpu/drm/xlnx/Kconfig | 3 +-
drivers/gpu/drm/xlnx/zynqmp_dp.c | 2 +-
drivers/misc/mei/hdcp/mei_hdcp.h | 2 +-
.../{dp/drm_dp_helper.h => display/drm_dp.h} | 698 +----------------
include/drm/{dp => display}/drm_dp_aux_bus.h | 0
.../{dp => display}/drm_dp_dual_mode_helper.h | 0
include/drm/display/drm_dp_helper.h | 722 ++++++++++++++++++
.../drm/{dp => display}/drm_dp_mst_helper.h | 2 +-
include/drm/{ => display}/drm_dsc.h | 8 +-
include/drm/display/drm_dsc_helper.h | 20 +
include/drm/{ => display}/drm_hdcp.h | 14 +-
include/drm/display/drm_hdcp_helper.h | 22 +
include/drm/display/drm_hdmi_helper.h | 27 +
.../{drm_scdc_helper.h => display/drm_scdc.h} | 52 +-
include/drm/display/drm_scdc_helper.h | 79 ++
include/drm/drm_connector.h | 3 -
include/drm/drm_edid.h | 12 -
include/drm/i915_mei_hdcp_interface.h | 2 +-
127 files changed, 1383 insertions(+), 1187 deletions(-)
create mode 100644 drivers/gpu/drm/display/Kconfig
create mode 100644 drivers/gpu/drm/display/Makefile
rename drivers/gpu/drm/{dp/drm_dp_helper_mod.c => display/drm_display_helper_mod.c} (51%)
rename drivers/gpu/drm/{dp => display}/drm_dp_aux_bus.c (99%)
rename drivers/gpu/drm/{dp => display}/drm_dp_aux_dev.c (99%)
rename drivers/gpu/drm/{dp => display}/drm_dp_cec.c (99%)
rename drivers/gpu/drm/{dp => display}/drm_dp_dual_mode_helper.c (99%)
rename drivers/gpu/drm/{dp/drm_dp.c => display/drm_dp_helper.c} (99%)
rename drivers/gpu/drm/{dp => display}/drm_dp_helper_internal.h (100%)
rename drivers/gpu/drm/{dp => display}/drm_dp_mst_topology.c (99%)
rename drivers/gpu/drm/{dp => display}/drm_dp_mst_topology_internal.h (94%)
rename drivers/gpu/drm/{drm_dsc.c => display/drm_dsc_helper.c} (99%)
rename drivers/gpu/drm/{drm_hdcp.c => display/drm_hdcp_helper.c} (99%)
create mode 100644 drivers/gpu/drm/display/drm_hdmi_helper.c
rename drivers/gpu/drm/{ => display}/drm_scdc_helper.c (99%)
delete mode 100644 drivers/gpu/drm/dp/Makefile
rename include/drm/{dp/drm_dp_helper.h => display/drm_dp.h} (74%)
rename include/drm/{dp => display}/drm_dp_aux_bus.h (100%)
rename include/drm/{dp => display}/drm_dp_dual_mode_helper.h (100%)
create mode 100644 include/drm/display/drm_dp_helper.h
rename include/drm/{dp => display}/drm_dp_mst_helper.h (99%)
rename include/drm/{ => display}/drm_dsc.h (97%)
create mode 100644 include/drm/display/drm_dsc_helper.h
rename include/drm/{ => display}/drm_hdcp.h (95%)
create mode 100644 include/drm/display/drm_hdcp_helper.h
create mode 100644 include/drm/display/drm_hdmi_helper.h
rename include/drm/{drm_scdc_helper.h => display/drm_scdc.h} (65%)
create mode 100644 include/drm/display/drm_scdc_helper.hbase-commit: d97978df553d768e457cb68c637b2b0a6188b87c
prerequisite-patch-id: c2b2f08f0eccc9f5df0c0da49fa1d36267deb11d
prerequisite-patch-id: c67e5d886a47b7d0266d81100837557fda34cb24
prerequisite-patch-id: 171147059747f2df58a2eceade4375d365bfb525
prerequisite-patch-id: 7a0633e1d5a688c6b2a17b61afe13ab529e6e3cb
Signature · 1 line
2.35.1
Thomas Zimmermann
maintainerPATCH v2 1/8 drm: Put related statements next to each other in Makefile
Give the Makefile a bit more structure by putting rules for core, helpers, drivers, etc next to each other.
--- drivers/gpu/drm/Makefile | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)
drivers/gpu/drm/Makefile +17 -6
@@ -18,7 +18,6 @@ drm-y := drm_aperture.o drm_auth.o drm_cache.o \ drm_syncobj.o drm_lease.o drm_writeback.o drm_client.o \ drm_client_modeset.o drm_atomic_uapi.o \ drm_managed.o drm_vblank_work.o - drm-$(CONFIG_DRM_LEGACY) += drm_agpsupport.o drm_bufs.o drm_context.o drm_dma.o \ drm_hashtab.o drm_irq.o drm_legacy_misc.o drm_lock.o \ drm_memory.o drm_scatter.o drm_vm.o
@@ -30,8 +29,16 @@ drm-$(CONFIG_PCI) += drm_pci.o 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) += drm.o obj-$(CONFIG_DRM_NOMODESET) += drm_nomodeset.o +obj-$(CONFIG_DRM_PANEL_ORIENTATION_QUIRKS) += drm_panel_orientation_quirks.o + +# +# Memory-management helpers +# + +obj-$(CONFIG_DRM_BUDDY) += drm_buddy.o drm_cma_helper-y := drm_gem_cma_helper.o drm_cma_helper-$(CONFIG_DRM_KMS_HELPER) += drm_fb_cma_helper.o
@@ -40,14 +47,16 @@ obj-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_cma_helper.o drm_shmem_helper-y := drm_gem_shmem_helper.o obj-$(CONFIG_DRM_GEM_SHMEM_HELPER) += drm_shmem_helper.o -obj-$(CONFIG_DRM_BUDDY) += drm_buddy.o - drm_vram_helper-y := drm_gem_vram_helper.o 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 +# +# Modesetting helpers +# + 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 \
@@ -60,14 +69,16 @@ drm_kms_helper-y := drm_bridge_connector.o drm_crtc_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 - obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o + +# +# Drivers and the rest +# + obj-$(CONFIG_DRM_DEBUG_SELFTEST) += selftests/ -obj-$(CONFIG_DRM) += drm.o 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/
Signature · 1 line
2.35.1
Thomas Zimmermann
maintainerPATCH v2 2/8 drm: Rename dp/ to display/
In reply to Thomas ZimmermannRename dp/ to display/ to account for additional display-related helpers, such as HDMI. Update all related include statements. No functional changes.
Various drivers, such as i915 and amdgpu, use similar naming scheme by putting code for video-output standards into a local display/ directory. The new directory's name is aligned with this convention.
v2:
* update commit message (Javier)
---
Documentation/gpu/drm-kms-helpers.rst | 26 +++++++++----------
drivers/gpu/drm/Makefile | 2 +-
.../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 | 3 ++-
.../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 +-
.../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 | 4 +--
.../drm/bridge/cadence/cdns-mhdp8546-core.c | 2 +-
.../drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
drivers/gpu/drm/bridge/ite-it6505.c | 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 => display}/Makefile | 0
drivers/gpu/drm/{dp => display}/drm_dp.c | 4 +--
.../gpu/drm/{dp => display}/drm_dp_aux_bus.c | 4 +--
.../gpu/drm/{dp => display}/drm_dp_aux_dev.c | 4 +--
drivers/gpu/drm/{dp => display}/drm_dp_cec.c | 2 +-
.../{dp => display}/drm_dp_dual_mode_helper.c | 2 +-
.../{dp => display}/drm_dp_helper_internal.h | 0
.../drm/{dp => display}/drm_dp_helper_mod.c | 0
.../drm/{dp => display}/drm_dp_mst_topology.c | 2 +-
.../drm_dp_mst_topology_internal.h | 2 +-
drivers/gpu/drm/drm_dsc.c | 3 ++-
drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +-
drivers/gpu/drm/gma500/intel_bios.c | 3 ++-
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/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 | 3 ++-
drivers/gpu/drm/msm/edp/edp.h | 3 ++-
drivers/gpu/drm/msm/edp/edp_ctrl.c | 3 ++-
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 | 6 +++--
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 +--
.../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/dp.c | 2 +-
drivers/gpu/drm/tegra/dpaux.c | 4 +--
drivers/gpu/drm/tegra/sor.c | 2 +-
drivers/gpu/drm/xlnx/zynqmp_dp.c | 2 +-
include/drm/{dp => display}/drm_dp_aux_bus.h | 0
.../{dp => display}/drm_dp_dual_mode_helper.h | 0
include/drm/{dp => display}/drm_dp_helper.h | 0
.../drm/{dp => display}/drm_dp_mst_helper.h | 2 +-
include/drm/drm_dsc.h | 2 +-
76 files changed, 106 insertions(+), 98 deletions(-)
rename drivers/gpu/drm/{dp => display}/Makefile (100%)
rename drivers/gpu/drm/{dp => display}/drm_dp.c (99%)
rename drivers/gpu/drm/{dp => display}/drm_dp_aux_bus.c (99%)
rename drivers/gpu/drm/{dp => display}/drm_dp_aux_dev.c (99%)
rename drivers/gpu/drm/{dp => display}/drm_dp_cec.c (99%)
rename drivers/gpu/drm/{dp => display}/drm_dp_dual_mode_helper.c (99%)
rename drivers/gpu/drm/{dp => display}/drm_dp_helper_internal.h (100%)
rename drivers/gpu/drm/{dp => display}/drm_dp_helper_mod.c (100%)
rename drivers/gpu/drm/{dp => display}/drm_dp_mst_topology.c (99%)
rename drivers/gpu/drm/{dp => display}/drm_dp_mst_topology_internal.h (94%)
rename include/drm/{dp => display}/drm_dp_aux_bus.h (100%)
rename include/drm/{dp => display}/drm_dp_dual_mode_helper.h (100%)
rename include/drm/{dp => display}/drm_dp_helper.h (100%)
rename include/drm/{dp => display}/drm_dp_mst_helper.h (99%)Documentation/gpu/drm-kms-helpers.rst +13 -13
@@ -232,34 +232,34 @@ HDCP Helper Functions Reference Display Port Helper Functions Reference ======================================= -.. kernel-doc:: drivers/gpu/drm/dp/drm_dp.c +.. kernel-doc:: drivers/gpu/drm/display/drm_dp_helper.c :doc: dp helpers -.. kernel-doc:: include/drm/dp/drm_dp_helper.h +.. kernel-doc:: include/drm/display/drm_dp_helper.h :internal: -.. kernel-doc:: drivers/gpu/drm/dp/drm_dp.c +.. kernel-doc:: drivers/gpu/drm/display/drm_dp_helper.c :export: Display Port CEC Helper Functions Reference =========================================== -.. kernel-doc:: drivers/gpu/drm/dp/drm_dp_cec.c +.. kernel-doc:: drivers/gpu/drm/display/drm_dp_cec.c :doc: dp cec helpers -.. kernel-doc:: drivers/gpu/drm/dp/drm_dp_cec.c +.. kernel-doc:: drivers/gpu/drm/display/drm_dp_cec.c :export: Display Port Dual Mode Adaptor Helper Functions Reference ========================================================= -.. kernel-doc:: drivers/gpu/drm/dp/drm_dp_dual_mode_helper.c +.. kernel-doc:: drivers/gpu/drm/display/drm_dp_dual_mode_helper.c :doc: dp dual mode helpers -.. kernel-doc:: include/drm/dp/drm_dp_dual_mode_helper.h +.. kernel-doc:: include/drm/display/drm_dp_dual_mode_helper.h :internal: -.. kernel-doc:: drivers/gpu/drm/dp/drm_dp_dual_mode_helper.c +.. kernel-doc:: drivers/gpu/drm/display/drm_dp_dual_mode_helper.c :export: Display Port MST Helpers
@@ -268,19 +268,19 @@ Display Port MST Helpers Overview -------- -.. kernel-doc:: drivers/gpu/drm/dp/drm_dp_mst_topology.c +.. kernel-doc:: drivers/gpu/drm/display/drm_dp_mst_topology.c :doc: dp mst helper -.. kernel-doc:: drivers/gpu/drm/dp/drm_dp_mst_topology.c +.. kernel-doc:: drivers/gpu/drm/display/drm_dp_mst_topology.c :doc: Branch device and port refcounting Functions Reference ------------------- -.. kernel-doc:: include/drm/dp/drm_dp_mst_helper.h +.. kernel-doc:: include/drm/display/drm_dp_mst_helper.h :internal: -.. kernel-doc:: drivers/gpu/drm/dp/drm_dp_mst_topology.c +.. kernel-doc:: drivers/gpu/drm/display/drm_dp_mst_topology.c :export: Topology Lifetime Internals
@@ -289,7 +289,7 @@ Topology Lifetime Internals These functions aren't exported to drivers, but are documented here to help make the MST topology helpers easier to understand -.. kernel-doc:: drivers/gpu/drm/dp/drm_dp_mst_topology.c +.. kernel-doc:: drivers/gpu/drm/display/drm_dp_mst_topology.c :functions: drm_dp_mst_topology_try_get_mstb drm_dp_mst_topology_get_mstb drm_dp_mst_topology_put_mstb drm_dp_mst_topology_try_get_port drm_dp_mst_topology_get_port
drivers/gpu/drm/Makefile +1 -1
@@ -80,7 +80,7 @@ obj-$(CONFIG_DRM_DEBUG_SELFTEST) += selftests/ obj-$(CONFIG_DRM_MIPI_DBI) += drm_mipi_dbi.o obj-$(CONFIG_DRM_MIPI_DSI) += drm_mipi_dsi.o obj-y += arm/ -obj-y += dp/ +obj-y += display/ obj-$(CONFIG_DRM_TTM) += ttm/ obj-$(CONFIG_DRM_SCHED) += scheduler/ obj-$(CONFIG_DRM_TDFX) += tdfx/
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +1 -1
@@ -24,9 +24,9 @@* Alex Deucher */ +#include <drm/display/drm_dp_helper.h> #include <drm/drm_edid.h> #include <drm/drm_fb_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
@@ -30,10 +30,10 @@#ifndef AMDGPU_MODE_H #define AMDGPU_MODE_H +#include <drm/display/drm_dp_helper.h> #include <drm/drm_crtc.h> #include <drm/drm_edid.h> #include <drm/drm_encoder.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/dp/drm_dp_mst_helper.h> +#include <drm/display/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 +2 -1
@@ -26,6 +26,8 @@*/ #include <drm/amdgpu_drm.h> +#include <drm/display/drm_dp_helper.h> +#include "amdgpu.h" #include "atom.h"
@@ -34,7 +36,6 @@#include "atombios_dp.h" #include "amdgpu_connectors.h" #include "amdgpu_atombios.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
@@ -73,10 +73,10 @@#include <linux/firmware.h> #include <linux/component.h> +#include <drm/display/drm_dp_mst_helper.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_uapi.h> #include <drm/drm_atomic_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
@@ -26,10 +26,10 @@#ifndef __AMDGPU_DM_H__#define __AMDGPU_DM_H__ +#include <drm/display/drm_dp_mst_helper.h> #include <drm/drm_atomic.h> #include <drm/drm_connector.h> #include <drm/drm_crtc.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
@@ -23,10 +23,10 @@* */ +#include <drm/display/drm_dp_helper.h> +#include <drm/display/drm_dp_mst_helper.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_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,8 +27,8 @@#include <dc_link.h> #include <inc/link_hwss.h> #include <inc/link_dpcd.h> -#include <drm/dp/drm_dp_helper.h> #include <dc_dp_types.h> +#include <drm/display/drm_dp_helper.h> #include "dm_helpers.h" #define END_ADDRESS (start, size) (start + size - 1)
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/dp/drm_dp_helper.h> +#include <drm/display/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
@@ -35,8 +35,8 @@#include <asm/byteorder.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_print.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/dp/drm_dp_helper.h> +#include <drm/display/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
@@ -29,8 +29,8 @@#include "mod_hdcp.h" #include "hdcp_log.h" +#include <drm/display/drm_dp_helper.h> #include <drm/drm_hdcp.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
@@ -18,11 +18,11 @@#include <linux/regulator/consumer.h> #include <linux/types.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_crtc.h> #include <drm/drm_crtc_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
@@ -18,10 +18,10 @@#include <linux/regulator/consumer.h> #include <linux/types.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_crtc.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
@@ -7,8 +7,8 @@*/ #include <linux/regmap.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm.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
@@ -9,8 +9,8 @@#ifndef _ANALOGIX_DP_CORE_H#define _ANALOGIX_DP_CORE_H +#include <drm/display/drm_dp_helper.h> #include <drm/drm_crtc.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 +2 -2
@@ -21,11 +21,11 @@#include <linux/of_graph.h> #include <linux/of_platform.h> +#include <drm/display/drm_dp_aux_bus.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_crtc_helper.h> -#include <drm/dp/drm_dp_aux_bus.h> -#include <drm/dp/drm_dp_helper.h> #include <drm/drm_edid.h> #include <drm/drm_hdcp.h> #include <drm/drm_mipi_dsi.h>
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c +1 -1
@@ -35,13 +35,13 @@#include <linux/slab.h> #include <linux/wait.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_state_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_connector.h> #include <drm/drm_crtc_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
@@ -15,9 +15,9 @@#include <linux/mutex.h> #include <linux/spinlock.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_connector.h> -#include <drm/dp/drm_dp_helper.h> struct clk ;struct device ;
drivers/gpu/drm/bridge/ite-it6505.c +1 -1
@@ -21,7 +21,7 @@#include <crypto/hash.h> -#include <drm/dp/drm_dp_helper.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_crtc.h>
drivers/gpu/drm/bridge/parade-ps8640.c +2 -2
@@ -13,9 +13,9 @@#include <linux/regmap.h> #include <linux/regulator/consumer.h> +#include <drm/display/drm_dp_aux_bus.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_bridge.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> #include <drm/drm_panel.h>
drivers/gpu/drm/bridge/tc358767.c +1 -1
@@ -31,9 +31,9 @@#include <linux/regmap.h> #include <linux/slab.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.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/tc358775.c +1 -1
@@ -19,10 +19,10 @@#include <asm/unaligned.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_crtc_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 +2 -2
@@ -23,12 +23,12 @@#include <asm/unaligned.h> +#include <drm/display/drm_dp_aux_bus.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_bridge_connector.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> #include <drm/drm_panel.h>
drivers/gpu/drm/display/Makefile renamed from drivers/gpu/drm/dp/Makefile +0 -0
drivers/gpu/drm/display/drm_dp.c renamed from drivers/gpu/drm/dp/drm_dp.c +2 -2
@@ -30,10 +30,10 @@#include <linux/seq_file.h> #include <linux/string_helpers.h> -#include <drm/dp/drm_dp_helper.h> +#include <drm/display/drm_dp_helper.h> +#include <drm/display/drm_dp_mst_helper.h> #include <drm/drm_print.h> #include <drm/drm_vblank.h> -#include <drm/dp/drm_dp_mst_helper.h> #include <drm/drm_panel.h> #include "drm_dp_helper_internal.h"
drivers/gpu/drm/display/drm_dp_aux_bus.c renamed from drivers/gpu/drm/dp/drm_dp_aux_bus.c +2 -2
@@ -19,8 +19,8 @@#include <linux/pm_domain.h> #include <linux/pm_runtime.h> -#include <drm/dp/drm_dp_aux_bus.h> -#include <drm/dp/drm_dp_helper.h> +#include <drm/display/drm_dp_aux_bus.h> +#include <drm/display/drm_dp_helper.h> /** * dp_aux_ep_match() - The match function for the dp_aux_bus.
drivers/gpu/drm/display/drm_dp_aux_dev.c renamed from drivers/gpu/drm/dp/drm_dp_aux_dev.c +2 -2
@@ -35,9 +35,9 @@#include <linux/uaccess.h> #include <linux/uio.h> +#include <drm/display/drm_dp_helper.h> +#include <drm/display/drm_dp_mst_helper.h> #include <drm/drm_crtc.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/display/drm_dp_cec.c renamed from drivers/gpu/drm/dp/drm_dp_cec.c +1 -1
@@ -11,9 +11,9 @@#include <media/cec.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_connector.h> #include <drm/drm_device.h> -#include <drm/dp/drm_dp_helper.h> /* * Unfortunately it turns out that we have a chicken-and-egg situation
drivers/gpu/drm/display/drm_dp_dual_mode_helper.c renamed from drivers/gpu/drm/dp/drm_dp_dual_mode_helper.c +1 -1
@@ -27,8 +27,8 @@#include <linux/slab.h> #include <linux/string.h> +#include <drm/display/drm_dp_dual_mode_helper.h> #include <drm/drm_device.h> -#include <drm/dp/drm_dp_dual_mode_helper.h> #include <drm/drm_print.h> /**
drivers/gpu/drm/display/drm_dp_helper_internal.h renamed from drivers/gpu/drm/dp/drm_dp_helper_internal.h +0 -0
drivers/gpu/drm/display/drm_dp_helper_mod.c renamed from drivers/gpu/drm/dp/drm_dp_helper_mod.c +0 -0
drivers/gpu/drm/display/drm_dp_mst_topology.c renamed from drivers/gpu/drm/dp/drm_dp_mst_topology.c +1 -1
@@ -38,7 +38,7 @@#include <linux/math64.h> #endif -#include <drm/dp/drm_dp_mst_helper.h> +#include <drm/display/drm_dp_mst_helper.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h>
drivers/gpu/drm/display/drm_dp_mst_topology_internal.h renamed from 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/dp/drm_dp_mst_helper.h> +#include <drm/display/drm_dp_mst_helper.h> void drm_dp_encode_sideband_req(const struct drm_dp_sideband_msg_req_body *req,
drivers/gpu/drm/drm_dsc.c +2 -1
@@ -11,8 +11,9 @@#include <linux/init.h> #include <linux/errno.h> #include <linux/byteorder/generic.h> + +#include <drm/display/drm_dp_helper.h> #include <drm/drm_print.h> -#include <drm/dp/drm_dp_helper.h> #include <drm/drm_dsc.h> /**
drivers/gpu/drm/gma500/cdv_intel_dp.c +1 -1
@@ -29,9 +29,9 @@#include <linux/module.h> #include <linux/slab.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_crtc.h> #include <drm/drm_crtc_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 +2 -1
@@ -5,8 +5,9 @@* Authors: * Eric Anholt <[email protected]> */ + +#include <drm/display/drm_dp_helper.h> #include <drm/drm.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/dp/drm_dp_helper.h> +#include <drm/display/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
@@ -35,11 +35,11 @@#include <linux/string_helpers.h> #include <linux/vga_switcheroo.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_uapi.h> #include <drm/drm_damage_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
@@ -31,8 +31,8 @@#include <linux/pwm.h> #include <linux/sched/clock.h> -#include <drm/dp/drm_dp_dual_mode_helper.h> -#include <drm/dp/drm_dp_mst_helper.h> +#include <drm/display/drm_dp_dual_mode_helper.h> +#include <drm/display/drm_dp_mst_helper.h> #include <drm/drm_atomic.h> #include <drm/drm_crtc.h> #include <drm/drm_dsc.h>
drivers/gpu/drm/i915/display/intel_dp.c +1 -1
@@ -35,9 +35,9 @@#include <asm/byteorder.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.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/dp/drm_dp_helper.h> -#include <drm/dp/drm_dp_mst_helper.h> +#include <drm/display/drm_dp_helper.h> +#include <drm/display/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/dp/drm_dp_helper.h> +#include <drm/display/drm_dp_helper.h> struct intel_crtc_state ;struct intel_dp ;
drivers/gpu/drm/i915/display/intel_lspcon.c +1 -1
@@ -23,8 +23,8 @@* */ +#include <drm/display/drm_dp_dual_mode_helper.h> #include <drm/drm_atomic_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/dp/drm_dp_helper.h> +#include <drm/display/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/dp/drm_dp_helper.h> +#include <drm/display/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/dp/drm_dp_helper.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_print.h> #include "dp_catalog.h"
drivers/gpu/drm/msm/dp/dp_ctrl.c +2 -1
@@ -11,8 +11,9 @@#include <linux/phy/phy.h> #include <linux/phy/phy-dp.h> #include <linux/pm_opp.h> + +#include <drm/display/drm_dp_helper.h> #include <drm/drm_fixed.h> -#include <drm/dp/drm_dp_helper.h> #include <drm/drm_print.h> #include "dp_reg.h"
drivers/gpu/drm/msm/edp/edp.h +2 -1
@@ -10,7 +10,8 @@#include <linux/interrupt.h> #include <linux/kernel.h> #include <linux/platform_device.h> -#include <drm/dp/drm_dp_helper.h> + +#include <drm/display/drm_dp_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_crtc.h>
drivers/gpu/drm/msm/edp/edp_ctrl.c +2 -1
@@ -6,7 +6,8 @@#include <linux/clk.h> #include <linux/gpio/consumer.h> #include <linux/regulator/consumer.h> -#include <drm/dp/drm_dp_helper.h> + +#include <drm/display/drm_dp_helper.h> #include <drm/drm_crtc.h> #include <drm/drm_edid.h>
drivers/gpu/drm/nouveau/dispnv50/disp.c +1 -1
@@ -33,9 +33,9 @@#include <linux/component.h> #include <linux/iopoll.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_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
@@ -33,10 +33,10 @@#include <nvhw/class/cl907d.h> #include <nvhw/drf.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_crtc.h> #include <drm/drm_edid.h> #include <drm/drm_encoder.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/dp/drm_dp_helper.h> +#include <drm/display/drm_dp_helper.h> #include "nouveau_drv.h" #include "nouveau_connector.h"
drivers/gpu/drm/nouveau/nouveau_encoder.h +4 -2
@@ -29,10 +29,12 @@#include <subdev/bios/dcb.h> +#include <drm/display/drm_dp_helper.h> +#include <drm/display/drm_dp_mst_helper.h> #include <drm/drm_encoder_slave.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 +2 -2
@@ -35,10 +35,10 @@#include <video/of_display_timing.h> #include <video/videomode.h> +#include <drm/display/drm_dp_aux_bus.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_crtc.h> #include <drm/drm_device.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 +2 -2
@@ -14,8 +14,8 @@#include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> -#include <drm/dp/drm_dp_aux_bus.h> -#include <drm/dp/drm_dp_helper.h> +#include <drm/display/drm_dp_aux_bus.h> +#include <drm/display/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/dp/drm_dp_helper.h> +#include <drm/display/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
@@ -24,10 +24,10 @@* Alex Deucher */ +#include <drm/display/drm_dp_mst_helper.h> #include <drm/drm_edid.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_fb_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/dp/drm_dp_mst_helper.h> +#include <drm/display/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
@@ -30,11 +30,11 @@#ifndef RADEON_MODE_H #define RADEON_MODE_H +#include <drm/display/drm_dp_helper.h> +#include <drm/display/drm_dp_mst_helper.h> #include <drm/drm_crtc.h> #include <drm/drm_edid.h> #include <drm/drm_encoder.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
@@ -19,10 +19,10 @@#include <video/of_videomode.h> #include <video/videomode.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/bridge/analogix_dp.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
@@ -15,8 +15,8 @@#include <sound/hdmi-codec.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_atomic_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/dp/drm_dp_helper.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_panel.h> #include <drm/drm_probe_helper.h> #include <sound/hdmi-codec.h>
drivers/gpu/drm/rockchip/rockchip_lvds.c +1 -1
@@ -17,10 +17,10 @@#include <linux/regmap.h> #include <linux/reset.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_bridge_connector.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
@@ -8,10 +8,10 @@#include <linux/component.h> #include <linux/of_graph.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_bridge_connector.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 +2 -2
@@ -7,10 +7,10 @@#include <linux/random.h> -#include <drm/dp/drm_dp_mst_helper.h> +#include <drm/display/drm_dp_mst_helper.h> #include <drm/drm_print.h> -#include "../dp/drm_dp_mst_topology_internal.h" +#include "../display/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/dp.c +1 -1
@@ -4,8 +4,8 @@* Copyright (C) 2015 Rob Clark */ +#include <drm/display/drm_dp_helper.h> #include <drm/drm_crtc.h> -#include <drm/dp/drm_dp_helper.h> #include <drm/drm_print.h> #include "dp.h"
drivers/gpu/drm/tegra/dpaux.c +2 -2
@@ -18,8 +18,8 @@#include <linux/reset.h> #include <linux/workqueue.h> -#include <drm/dp/drm_dp_helper.h> -#include <drm/dp/drm_dp_aux_bus.h> +#include <drm/display/drm_dp_helper.h> +#include <drm/display/drm_dp_aux_bus.h> #include <drm/drm_panel.h> #include "dp.h"
drivers/gpu/drm/tegra/sor.c +1 -1
@@ -16,9 +16,9 @@#include <soc/tegra/pmc.h> +#include <drm/display/drm_dp_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_debugfs.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
@@ -9,11 +9,11 @@* - Laurent Pinchart <[email protected]> */ +#include <drm/display/drm_dp_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_connector.h> #include <drm/drm_crtc.h> #include <drm/drm_device.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/display/drm_dp_aux_bus.h renamed from include/drm/dp/drm_dp_aux_bus.h +0 -0
include/drm/display/drm_dp_dual_mode_helper.h renamed from include/drm/dp/drm_dp_dual_mode_helper.h +0 -0
include/drm/display/drm_dp_helper.h renamed from include/drm/dp/drm_dp_helper.h +0 -0
include/drm/display/drm_dp_mst_helper.h renamed from include/drm/dp/drm_dp_mst_helper.h +1 -1
@@ -23,7 +23,7 @@#define _DRM_DP_MST_HELPER_H_#include <linux/types.h> -#include <drm/dp/drm_dp_helper.h> +#include <drm/display/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/dp/drm_dp_helper.h> +#include <drm/display/drm_dp_helper.h> /* VESA Display Stream Compression DSC 1.2 constants */ #define DSC_NUM_BUF_RANGES 15
Signature · 1 line
2.35.1
Thomas Zimmermann
maintainerPATCH v2 3/8 drm/display: Introduce a DRM display-helper module
In reply to Thomas ZimmermannReplace the DP-helper module with a display-helper module. The support for DisplayPort becomes an internal option that drivers have to select. Update all related Kconfig and Makefile rules.
Besides the existing code for DisplayPort, the new module will contain helpers for other video-output standards, such as HDMI. Drivers will have to select their required video-output helpers.
Linking all display-related code into a single module avoids the proliferation of small kernel modules.
The module parameters drm_dp_cec_unregister_delay, dp_aux_i2c_speed_khz, and dp_aux_i2c_transfer_size are moving from the drm_dp_helper namespace to drm_display_helper.
v2:
* mention module parameters in commit message (Javier)
* distiguish between display module and DP support in Kconfig
* update Makefile rules for DP helpers
* move Kconfig rules into separate file under display/
---
drivers/gpu/drm/Kconfig | 39 ++++---------------
drivers/gpu/drm/bridge/Kconfig | 15 ++++---
drivers/gpu/drm/bridge/analogix/Kconfig | 9 +++--
drivers/gpu/drm/bridge/cadence/Kconfig | 3 +-
drivers/gpu/drm/display/Kconfig | 37 ++++++++++++++++++
drivers/gpu/drm/display/Makefile | 11 ++++--
..._helper_mod.c => drm_display_helper_mod.c} | 10 ++---
.../drm/display/{drm_dp.c => drm_dp_helper.c} | 0
drivers/gpu/drm/exynos/Kconfig | 3 +-
drivers/gpu/drm/i915/Kconfig | 3 +-
drivers/gpu/drm/msm/Kconfig | 3 +-
drivers/gpu/drm/nouveau/Kconfig | 3 +-
drivers/gpu/drm/panel/Kconfig | 3 +-
drivers/gpu/drm/rockchip/Kconfig | 4 +-
drivers/gpu/drm/tegra/Kconfig | 3 +-
drivers/gpu/drm/xlnx/Kconfig | 3 +-
16 files changed, 90 insertions(+), 59 deletions(-)
create mode 100644 drivers/gpu/drm/display/Kconfig
rename drivers/gpu/drm/display/{drm_dp_helper_mod.c => drm_display_helper_mod.c} (51%)
rename drivers/gpu/drm/display/{drm_dp.c => drm_dp_helper.c} (100%)drivers/gpu/drm/Kconfig +7 -32
@@ -36,19 +36,6 @@ config DRM_MIPI_DSI bool depends on DRM -config DRM_DP_AUX_BUS - tristate - depends on DRM - depends on OF - -config DRM_DP_AUX_CHARDEV - bool "DRM DP AUX Interface" - depends on DRM - help - Choose this option to enable a /dev/drm_dp_auxN node that allows to - read and write values to arbitrary DPCD registers on the DP aux - channel. - config DRM_DEBUG_MM bool "Insert extra checks and debug info into the DRM range managers" default n
@@ -68,7 +55,8 @@ config DRM_DEBUG_SELFTEST depends on DRM depends on DEBUG_KERNEL select PRIME_NUMBERS - select DRM_DP_HELPER + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER select DRM_LIB_RANDOM select DRM_KMS_HELPER select DRM_BUDDY
@@ -82,12 +70,6 @@ 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
@@ -187,16 +169,7 @@ config DRM_LOAD_EDID_FIRMWARE default case is N. Details and instructions how to build your own EDID data are given in Documentation/admin-guide/edid.rst. -config DRM_DP_CEC - bool "Enable DisplayPort CEC-Tunneling-over-AUX HDMI support" - depends on DRM - select CEC_CORE - help - Choose this option if you want to enable HDMI CEC support for - DisplayPort/USB-C to HDMI adapters. - - Note: not all adapters support this feature, and even for those - that do support this they often do not hook up the CEC pin. +source "drivers/gpu/drm/display/Kconfig" config DRM_TTM tristate
@@ -250,7 +223,8 @@ config DRM_RADEON depends on DRM && PCI && MMU depends on AGP || !AGP select FW_LOADER - select DRM_DP_HELPER + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select DRM_TTM select DRM_TTM_HELPER
@@ -271,7 +245,8 @@ config DRM_AMDGPU tristate "AMD GPU" depends on DRM && PCI && MMU select FW_LOADER - select DRM_DP_HELPER + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select DRM_SCHED select DRM_TTM
drivers/gpu/drm/bridge/Kconfig +10 -5
@@ -78,7 +78,8 @@ config DRM_DISPLAY_CONNECTOR config DRM_ITE_IT6505 tristate "ITE IT6505 DisplayPort bridge" depends on OF - select DRM_DP_HELPER + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select EXTCON help
@@ -192,8 +193,9 @@ config DRM_PARADE_PS8622 config DRM_PARADE_PS8640 tristate "Parade PS8640 MIPI DSI to eDP Converter" depends on OF + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER select DRM_DP_AUX_BUS - select DRM_DP_HELPER select DRM_KMS_HELPER select DRM_MIPI_DSI select DRM_PANEL
@@ -264,7 +266,8 @@ config DRM_TOSHIBA_TC358764 config DRM_TOSHIBA_TC358767 tristate "Toshiba TC358767 eDP bridge" depends on OF - select DRM_DP_HELPER + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select REGMAP_I2C select DRM_MIPI_DSI
@@ -285,7 +288,8 @@ config DRM_TOSHIBA_TC358768 config DRM_TOSHIBA_TC358775 tristate "Toshiba TC358775 DSI/LVDS bridge" depends on OF - select DRM_DP_HELPER + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select REGMAP_I2C select DRM_PANEL
@@ -313,7 +317,8 @@ config DRM_TI_SN65DSI83 config DRM_TI_SN65DSI86 tristate "TI SN65DSI86 DSI to eDP bridge" depends on OF - select DRM_DP_HELPER + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select REGMAP_I2C select DRM_PANEL
drivers/gpu/drm/bridge/analogix/Kconfig +6 -3
@@ -3,7 +3,8 @@ config DRM_ANALOGIX_ANX6345 tristate "Analogix ANX6345 bridge" depends on OF select DRM_ANALOGIX_DP - select DRM_DP_HELPER + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select REGMAP_I2C help
@@ -15,7 +16,8 @@ config DRM_ANALOGIX_ANX6345 config DRM_ANALOGIX_ANX78XX tristate "Analogix ANX78XX bridge" select DRM_ANALOGIX_DP - select DRM_DP_HELPER + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select REGMAP_I2C help
@@ -32,8 +34,9 @@ config DRM_ANALOGIX_ANX7625 tristate "Analogix Anx7625 MIPI to DP interface support" depends on DRM depends on OF + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER select DRM_DP_AUX_BUS - select DRM_DP_HELPER select DRM_MIPI_DSI help ANX7625 is an ultra-low power 4K mobile HD transmitter
drivers/gpu/drm/bridge/cadence/Kconfig +2 -1
@@ -1,7 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only config DRM_CDNS_MHDP8546 tristate "Cadence DPI/DP bridge" - select DRM_DP_HELPER + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select DRM_PANEL_BRIDGE depends on OF
drivers/gpu/drm/display/Kconfig new file +37 -0
@@ -0,0 +1,37 @@ +# SPDX-License-Identifier: MIT + +config DRM_DP_AUX_BUS + tristate + depends on DRM + depends on OF + +config DRM_DISPLAY_HELPER + tristate + depends on DRM + help + DRM helpers for display adapters. + +config DRM_DISPLAY_DP_HELPER + bool + depends on DRM_DISPLAY_HELPER + help + DRM display helpers for DisplayPort. + +config DRM_DP_AUX_CHARDEV + bool "DRM DP AUX Interface" + depends on DRM + help + Choose this option to enable a /dev/drm_dp_auxN node that allows to + read and write values to arbitrary DPCD registers on the DP aux + channel. + +config DRM_DP_CEC + bool "Enable DisplayPort CEC-Tunneling-over-AUX HDMI support" + depends on DRM + select CEC_CORE + help + Choose this option if you want to enable HDMI CEC support for + DisplayPort/USB-C to HDMI adapters. + + Note: not all adapters support this feature, and even for those + that do support this they often do not hook up the CEC pin.
drivers/gpu/drm/display/Makefile +7 -4
@@ -2,8 +2,11 @@ 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 +drm_display_helper-y := drm_display_helper_mod.o +drm_display_helper-$(CONFIG_DRM_DISPLAY_DP_HELPER) += drm_dp_dual_mode_helper.o \ + drm_dp_helper.o \ + drm_dp_mst_topology.o +drm_display_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o +drm_display_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o -obj-$(CONFIG_DRM_DP_HELPER) += drm_dp_helper.o +obj-$(CONFIG_DRM_DISPLAY_HELPER) += drm_display_helper.o
drivers/gpu/drm/display/drm_display_helper_mod.c renamed from drivers/gpu/drm/display/drm_dp_helper_mod.c +5 -5
@@ -4,19 +4,19 @@#include "drm_dp_helper_internal.h" -MODULE_DESCRIPTION ("DRM DisplayPort helper" ); +MODULE_DESCRIPTION ("DRM display adapter helper" );MODULE_LICENSE ("GPL and additional rights" ); -static int __init drm_dp_helper_module_init (void ) +static int __init drm_display_helper_module_init (void ) {return drm_dp_aux_dev_init (); } -static void __exit drm_dp_helper_module_exit(void) +static void __exit drm_display_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); +module_init (drm_display_helper_module_init); +module_exit (drm_display_helper_module_exit);
drivers/gpu/drm/display/drm_dp_helper.c renamed from drivers/gpu/drm/display/drm_dp.c +0 -0
drivers/gpu/drm/exynos/Kconfig +2 -1
@@ -4,6 +4,7 @@ config DRM_EXYNOS depends on OF && DRM && COMMON_CLK depends on ARCH_S3C64XX || ARCH_S5PV210 || ARCH_EXYNOS || ARCH_MULTIPLATFORM || COMPILE_TEST depends on MMU + select DRM_DISPLAY_HELPER if DRM_EXYNOS_DP select DRM_KMS_HELPER select VIDEOMODE_HELPERS select SND_SOC_HDMI_CODEC if SND_SOC
@@ -66,7 +67,7 @@ config DRM_EXYNOS_DP bool "Exynos specific extensions for Analogix DP driver" depends on DRM_EXYNOS_FIMD || DRM_EXYNOS7_DECON select DRM_ANALOGIX_DP - select DRM_DP_HELPER + select DRM_DISPLAY_DP_HELPER default DRM_EXYNOS select DRM_PANEL help
drivers/gpu/drm/i915/Kconfig +2 -1
@@ -10,7 +10,8 @@ config DRM_I915 # the shmem_readpage() which depends upon tmpfs select SHMEM select TMPFS - select DRM_DP_HELPER + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select DRM_PANEL select DRM_MIPI_DSI
drivers/gpu/drm/msm/Kconfig +2 -1
@@ -12,7 +12,8 @@ config DRM_MSM select IOMMU_IO_PGTABLE select QCOM_MDT_LOADER if ARCH_QCOM select REGULATOR - select DRM_DP_HELPER + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select DRM_PANEL select DRM_BRIDGE
drivers/gpu/drm/nouveau/Kconfig +2 -1
@@ -4,7 +4,8 @@ config DRM_NOUVEAU depends on DRM && PCI && MMU select IOMMU_API select FW_LOADER - select DRM_DP_HELPER + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select DRM_TTM select DRM_TTM_HELPER
drivers/gpu/drm/panel/Kconfig +2 -1
@@ -105,8 +105,9 @@ config DRM_PANEL_EDP depends on BACKLIGHT_CLASS_DEVICE depends on PM select VIDEOMODE_HELPERS + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER select DRM_DP_AUX_BUS - select DRM_DP_HELPER select DRM_KMS_HELPER help DRM panel driver for dumb eDP panels that need at most a regulator and
drivers/gpu/drm/rockchip/Kconfig +2 -2
@@ -2,13 +2,12 @@ config DRM_ROCKCHIP tristate "DRM Support for Rockchip" depends on DRM && ROCKCHIP_IOMMU - select DRM_DP_HELPER + select DRM_DISPLAY_HELPER if ROCKCHIP_ANALOGIX_DP select DRM_GEM_CMA_HELPER select DRM_KMS_HELPER select DRM_PANEL select VIDEOMODE_HELPERS select DRM_ANALOGIX_DP if ROCKCHIP_ANALOGIX_DP - select DRM_DP_HELPER if ROCKCHIP_ANALOGIX_DP select DRM_DW_HDMI if ROCKCHIP_DW_HDMI select DRM_DW_MIPI_DSI if ROCKCHIP_DW_MIPI_DSI select GENERIC_PHY if ROCKCHIP_DW_MIPI_DSI
@@ -25,6 +24,7 @@ if DRM_ROCKCHIP config ROCKCHIP_ANALOGIX_DP bool "Rockchip specific extensions for Analogix DP driver" + select DRM_DISPLAY_DP_HELPER help This selects support for Rockchip SoC specific extensions for the Analogix Core DP driver. If you want to enable DP
drivers/gpu/drm/tegra/Kconfig +2 -1
@@ -5,8 +5,9 @@ config DRM_TEGRA depends on COMMON_CLK depends on DRM depends on OF + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER select DRM_DP_AUX_BUS - select DRM_DP_HELPER select DRM_KMS_HELPER select DRM_MIPI_DSI select DRM_PANEL
drivers/gpu/drm/xlnx/Kconfig +2 -1
@@ -6,7 +6,8 @@ config DRM_ZYNQMP_DPSUB depends on PHY_XILINX_ZYNQMP depends on XILINX_ZYNQMP_DPDMA select DMA_ENGINE - select DRM_DP_HELPER + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER select DRM_GEM_CMA_HELPER select DRM_KMS_HELPER select GENERIC_PHY
Signature · 1 line
2.35.1
Thomas Zimmermann
maintainerPATCH v2 4/8 drm/display: Split DisplayPort header into core and helper
In reply to Thomas ZimmermannMove DisplayPort protocol constants and structures into the new header drm_dp.h, which can be used by DRM core components. The existing header drm_dp_helper.h now only contains helper code for graphics drivers. No functional changes.
--- Documentation/gpu/drm-kms-helpers.rst | 3 + include/drm/display/drm_dp.h | 1688 +++++++++++++++++++++++++ include/drm/display/drm_dp_helper.h | 1662 +----------------------- 3 files changed, 1693 insertions(+), 1660 deletions(-) create mode 100644 include/drm/display/drm_dp.h
Documentation/gpu/drm-kms-helpers.rst +3 -0
@@ -235,6 +235,9 @@ Display Port Helper Functions Reference .. kernel-doc:: drivers/gpu/drm/display/drm_dp_helper.c :doc: dp helpers +.. kernel-doc:: include/drm/display/drm_dp.h + :internal: + .. kernel-doc:: include/drm/display/drm_dp_helper.h :internal:
include/drm/display/drm_dp.h new file +1688 -0
1,688 lines not on this page · raw message
include/drm/display/drm_dp_helper.h +2 -1660
1,303 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.35.1
Part of the diff is not shown here. View the raw message.
Thomas Zimmermann
maintainerPATCH v2 5/8 drm/display: Move DSC header and helpers into display-helper module
In reply to Thomas ZimmermannDSC is the Display Stream Compression standard for DisplayPort. Move the DSC code into display/ and split the header into files for protocol core and DRM helpers. Adapt all users of the code. No functional changes.
To avoid the proliferation of Kconfig options, DSC is part of DRM's support for DisplayPort. If necessary, a new option could make DSC an independent feature.
---
Documentation/gpu/drm-kms-helpers.rst | 6 +++---
drivers/gpu/drm/Makefile | 2 +-
.../gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 2 ++
.../gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h | 2 +-
.../drm/amd/display/dc/dml/dsc/rc_calc_fpu.h | 2 +-
drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 4 ++--
.../gpu/drm/amd/display/dc/dsc/dscc_types.h | 2 +-
.../gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c | 2 +-
drivers/gpu/drm/display/Makefile | 3 ++-
.../{drm_dsc.c => display/drm_dsc_helper.c} | 2 +-
drivers/gpu/drm/drm_mipi_dsi.c | 6 +++---
drivers/gpu/drm/i915/display/icl_dsi.c | 1 +
drivers/gpu/drm/i915/display/intel_bios.c | 1 +
.../drm/i915/display/intel_display_types.h | 2 +-
drivers/gpu/drm/i915/display/intel_dp.c | 1 +
.../gpu/drm/i915/display/intel_qp_tables.c | 2 +-
drivers/gpu/drm/i915/display/intel_vdsc.c | 2 ++
include/drm/{ => display}/drm_dsc.h | 8 +-------
include/drm/display/drm_dsc_helper.h | 20 +++++++++++++++++++
19 files changed, 46 insertions(+), 24 deletions(-)
rename drivers/gpu/drm/{drm_dsc.c => display/drm_dsc_helper.c} (99%)
rename include/drm/{ => display}/drm_dsc.h (97%)
create mode 100644 include/drm/display/drm_dsc_helper.hDocumentation/gpu/drm-kms-helpers.rst +3 -3
@@ -326,13 +326,13 @@ MIPI DSI Helper Functions Reference Display Stream Compression Helper Functions Reference ===================================================== -.. kernel-doc:: drivers/gpu/drm/drm_dsc.c +.. kernel-doc:: drivers/gpu/drm/display/drm_dsc_helper.c :doc: dsc helpers -.. kernel-doc:: include/drm/drm_dsc.h +.. kernel-doc:: include/drm/display/drm_dsc.h :internal: -.. kernel-doc:: drivers/gpu/drm/drm_dsc.c +.. kernel-doc:: drivers/gpu/drm/display/drm_dsc_helper.c :export: Output Probing Helper Functions Reference
drivers/gpu/drm/Makefile +1 -1
@@ -58,7 +58,7 @@ obj-$(CONFIG_DRM_TTM_HELPER) += drm_ttm_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_encoder_slave.o drm_flip_work.o drm_hdcp.o \ drm_probe_helper.o \ drm_plane_helper.o drm_atomic_helper.o \ drm_kms_helper_common.o \
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c +2 -0
@@ -23,6 +23,8 @@* */ +#include <drm/display/drm_dsc_helper.h> +#include "reg_helper.h" #include "dcn20_dsc.h" #include "dsc/dscc_types.h"
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h +1 -1
@@ -26,7 +26,7 @@#include "dsc.h" #include "dsc/dscc_types.h" -#include <drm/drm_dsc.h> +#include <drm/display/drm_dsc.h> #define TO_DCN20_DSC (dsc)\ container_of(dsc, struct dcn20_dsc, base)
drivers/gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.h +1 -1
@@ -27,7 +27,7 @@#define __RC_CALC_FPU_H__#include "os_types.h" -#include <drm/drm_dsc.h> +#include <drm/display/drm_dsc.h> #define QP_SET_SIZE 15
drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c +2 -2
@@ -22,10 +22,10 @@* Author: AMD */ -#include <drm/drm_dsc.h> +#include <drm/display/drm_dp_helper.h> +#include <drm/display/drm_dsc_helper.h> #include "dc_hw_types.h" #include "dsc.h" -#include <drm/display/drm_dp_helper.h> #include "dc.h" #include "rc_calc.h" #include "fixed31_32.h"
drivers/gpu/drm/amd/display/dc/dsc/dscc_types.h +1 -1
@@ -26,7 +26,7 @@#ifndef __DSCC_TYPES_H__#define __DSCC_TYPES_H__ -#include <drm/drm_dsc.h> +#include <drm/display/drm_dsc.h> #ifndef NUM_BUF_RANGES #define NUM_BUF_RANGES 15
drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c +1 -1
@@ -22,7 +22,7 @@* Authors: AMD * */ -#include <drm/drm_dsc.h> +#include <drm/display/drm_dsc_helper.h> #include "dscc_types.h" #include "rc_calc.h"
drivers/gpu/drm/display/Makefile +2 -1
@@ -5,7 +5,8 @@ obj-$(CONFIG_DRM_DP_AUX_BUS) += drm_dp_aux_bus.o drm_display_helper-y := drm_display_helper_mod.o drm_display_helper-$(CONFIG_DRM_DISPLAY_DP_HELPER) += drm_dp_dual_mode_helper.o \ drm_dp_helper.o \ - drm_dp_mst_topology.o + drm_dp_mst_topology.o \ + drm_dsc_helper.o drm_display_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o drm_display_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o
drivers/gpu/drm/display/drm_dsc_helper.c renamed from drivers/gpu/drm/drm_dsc.c +1 -1
@@ -13,8 +13,8 @@#include <linux/byteorder/generic.h> #include <drm/display/drm_dp_helper.h> +#include <drm/display/drm_dsc_helper.h> #include <drm/drm_print.h> -#include <drm/drm_dsc.h> /** * DOC: dsc helpers
drivers/gpu/drm/drm_mipi_dsi.c +3 -3
@@ -25,16 +25,16 @@* USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include <drm/drm_mipi_dsi.h> -#include <linux/device.h> #include <linux/module.h> #include <linux/of_device.h> #include <linux/pm_runtime.h> #include <linux/slab.h> -#include <drm/drm_dsc.h> +#include <drm/display/drm_dsc.h> +#include <drm/drm_mipi_dsi.h> #include <drm/drm_print.h> +#include <video/mipi_display.h> /**
drivers/gpu/drm/i915/display/icl_dsi.c +1 -0
@@ -25,6 +25,7 @@* Jani Nikula <[email protected]> */ +#include <drm/display/drm_dsc_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_mipi_dsi.h>
drivers/gpu/drm/i915/display/intel_bios.c +1 -0
@@ -26,6 +26,7 @@*/ #include <drm/display/drm_dp_helper.h> +#include <drm/display/drm_dsc_helper.h> #include "display/intel_display.h" #include "display/intel_display_types.h"
drivers/gpu/drm/i915/display/intel_display_types.h +1 -1
@@ -33,9 +33,9 @@#include <drm/display/drm_dp_dual_mode_helper.h> #include <drm/display/drm_dp_mst_helper.h> +#include <drm/display/drm_dsc.h> #include <drm/drm_atomic.h> #include <drm/drm_crtc.h> -#include <drm/drm_dsc.h> #include <drm/drm_encoder.h> #include <drm/drm_fourcc.h> #include <drm/drm_probe_helper.h>
drivers/gpu/drm/i915/display/intel_dp.c +1 -0
@@ -36,6 +36,7 @@#include <asm/byteorder.h> #include <drm/display/drm_dp_helper.h> +#include <drm/display/drm_dsc_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> #include <drm/drm_edid.h>
drivers/gpu/drm/i915/display/intel_qp_tables.c +1 -1
@@ -3,7 +3,7 @@* Copyright © 2021 Intel Corporation */ -#include <drm/drm_dsc.h> +#include <drm/display/drm_dsc.h> #include "i915_utils.h" #include "intel_qp_tables.h"
drivers/gpu/drm/i915/display/intel_vdsc.c +2 -0
@@ -7,6 +7,8 @@*/ #include <linux/limits.h> +#include <drm/display/drm_dsc_helper.h> +#include "i915_drv.h" #include "intel_crtc.h" #include "intel_de.h"
include/drm/display/drm_dsc.h renamed from include/drm/drm_dsc.h +1 -7
@@ -8,7 +8,7 @@#ifndef DRM_DSC_H_ #define DRM_DSC_H_ -#include <drm/display/drm_dp_helper.h> +#include <drm/display/drm_dp.h> /* VESA Display Stream Compression DSC 1.2 constants */ #define DSC_NUM_BUF_RANGES 15
@@ -602,10 +602,4 @@ struct drm_dsc_pps_infoframe { struct drm_dsc_picture_parameter_set pps_payload; } __packed; -void drm_dsc_dp_pps_header_init (struct dp_sdp_header *pps_header); -int drm_dsc_dp_rc_buffer_size (u8 rc_buffer_block_size,u8 rc_buffer_size); -void drm_dsc_pps_payload_pack (struct drm_dsc_picture_parameter_set *pps_sdp, -const struct drm_dsc_config *dsc_cfg); -int drm_dsc_compute_rc_parameters (struct drm_dsc_config *vdsc_cfg); -#endif /* _DRM_DSC_H_ */
include/drm/display/drm_dsc_helper.h new file +20 -0
@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: MIT +* Copyright (C) 2018 Intel Corp. +* +* Authors: +* Manasi Navare <[email protected]> +*/ + +#ifndef DRM_DSC_HELPER_H_ +#define DRM_DSC_HELPER_H_ + +#include <drm/display/drm_dsc.h> + +void drm_dsc_dp_pps_header_init (struct dp_sdp_header *pps_header); +int drm_dsc_dp_rc_buffer_size (u8 rc_buffer_block_size,u8 rc_buffer_size); +void drm_dsc_pps_payload_pack (struct drm_dsc_picture_parameter_set *pps_sdp, +const struct drm_dsc_config *dsc_cfg); +int drm_dsc_compute_rc_parameters (struct drm_dsc_config *vdsc_cfg); + +#endif /* _DRM_DSC_HELPER_H_ */ +
Signature · 1 line
2.35.1
Thomas Zimmermann
maintainerPATCH v2 6/8 drm/display: Move HDCP helpers into display-helper module
In reply to Thomas ZimmermannMove DRM's HDCP helper library into the display/ subdirectory and add it to DRM's display helpers. Split the header file into core and helpers. Update all affected drivers. No functional changes.
v2:
* fix include statements (Jani, Javier)
* update Kconfig symbols
---
Documentation/gpu/drm-kms-helpers.rst | 2 +-
drivers/gpu/drm/Makefile | 2 +-
drivers/gpu/drm/amd/display/Kconfig | 1 +
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-
.../amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 2 +-
.../gpu/drm/amd/display/modules/hdcp/hdcp.h | 2 +-
drivers/gpu/drm/bridge/Kconfig | 1 +
drivers/gpu/drm/bridge/analogix/Kconfig | 1 +
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-hdcp.c | 2 +-
drivers/gpu/drm/bridge/ite-it6505.c | 2 +-
drivers/gpu/drm/display/Kconfig | 6 +++++
drivers/gpu/drm/display/Makefile | 1 +
.../{drm_hdcp.c => display/drm_hdcp_helper.c} | 4 +---
drivers/gpu/drm/i915/Kconfig | 1 +
drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 2 +-
drivers/gpu/drm/i915/display/intel_gmbus.c | 2 +-
drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +-
drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +-
drivers/misc/mei/hdcp/mei_hdcp.h | 2 +-
include/drm/{ => display}/drm_hdcp.h | 14 ++----------
include/drm/display/drm_hdcp_helper.h | 22 +++++++++++++++++++
include/drm/i915_mei_hdcp_interface.h | 2 +-
25 files changed, 52 insertions(+), 30 deletions(-)
rename drivers/gpu/drm/{drm_hdcp.c => display/drm_hdcp_helper.c} (99%)
rename include/drm/{ => display}/drm_hdcp.h (95%)
create mode 100644 include/drm/display/drm_hdcp_helper.hDocumentation/gpu/drm-kms-helpers.rst +1 -1
@@ -226,7 +226,7 @@ Panel Self Refresh Helper Reference HDCP Helper Functions Reference =============================== -.. kernel-doc:: drivers/gpu/drm/drm_hdcp.c +.. kernel-doc:: drivers/gpu/drm/display/drm_hdcp_helper.c :export: Display Port Helper Functions Reference
drivers/gpu/drm/Makefile +1 -1
@@ -58,7 +58,7 @@ obj-$(CONFIG_DRM_TTM_HELPER) += drm_ttm_helper.o # drm_kms_helper-y := drm_bridge_connector.o drm_crtc_helper.o \ - drm_encoder_slave.o drm_flip_work.o drm_hdcp.o \ + drm_encoder_slave.o drm_flip_work.o \ drm_probe_helper.o \ drm_plane_helper.o drm_atomic_helper.o \ drm_kms_helper_common.o \
drivers/gpu/drm/amd/display/Kconfig +1 -0
@@ -20,6 +20,7 @@ config DRM_AMD_DC_DCN config DRM_AMD_DC_HDCP bool "Enable HDCP support in DC" depends on DRM_AMD_DC + select DRM_DISPLAY_HDCP_HELPER help Choose this option if you want to support HDCP authentication.
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -1
@@ -48,7 +48,7 @@#include "amdgpu_dm.h" #ifdef CONFIG_DRM_AMD_DC_HDCP #include "amdgpu_dm_hdcp.h" -#include <drm/drm_hdcp.h> +#include <drm/display/drm_hdcp_helper.h> #endif #include "amdgpu_pm.h" #include "amdgpu_atombios.h"
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c +1 -1
@@ -27,7 +27,7 @@#include "amdgpu.h" #include "amdgpu_dm.h" #include "dm_helpers.h" -#include <drm/drm_hdcp.h> +#include <drm/display/drm_hdcp_helper.h> #include "hdcp_psp.h" /*
drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h +1 -1
@@ -30,7 +30,7 @@#include "hdcp_log.h" #include <drm/display/drm_dp_helper.h> -#include <drm/drm_hdcp.h> +#include <drm/display/drm_hdcp_helper.h> enum mod_hdcp_trans_input_result {UNKNOWN =0 ,
drivers/gpu/drm/bridge/Kconfig +1 -0
@@ -79,6 +79,7 @@ config DRM_ITE_IT6505 tristate "ITE IT6505 DisplayPort bridge" depends on OF select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HDCP_HELPER select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select EXTCON
drivers/gpu/drm/bridge/analogix/Kconfig +1 -0
@@ -35,6 +35,7 @@ config DRM_ANALOGIX_ANX7625 depends on DRM depends on OF select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HDCP_HELPER select DRM_DISPLAY_HELPER select DRM_DP_AUX_BUS select DRM_MIPI_DSI
drivers/gpu/drm/bridge/analogix/anx7625.c +1 -1
@@ -23,11 +23,11 @@#include <drm/display/drm_dp_aux_bus.h> #include <drm/display/drm_dp_helper.h> +#include <drm/display/drm_hdcp_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_edid.h> -#include <drm/drm_hdcp.h> #include <drm/drm_mipi_dsi.h> #include <drm/drm_of.h> #include <drm/drm_panel.h>
drivers/gpu/drm/bridge/cadence/Kconfig +1 -0
@@ -2,6 +2,7 @@ config DRM_CDNS_MHDP8546 tristate "Cadence DPI/DP bridge" select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HDCP_HELPER select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select DRM_PANEL_BRIDGE
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c +1 -1
@@ -36,13 +36,13 @@#include <linux/wait.h> #include <drm/display/drm_dp_helper.h> +#include <drm/display/drm_hdcp_helper.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_state_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_connector.h> #include <drm/drm_crtc_helper.h> -#include <drm/drm_hdcp.h> #include <drm/drm_modeset_helper_vtables.h> #include <drm/drm_print.h> #include <drm/drm_probe_helper.h>
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c +1 -1
@@ -11,7 +11,7 @@#include <asm/unaligned.h> -#include <drm/drm_hdcp.h> +#include <drm/display/drm_hdcp_helper.h> #include "cdns-mhdp8546-hdcp.h"
drivers/gpu/drm/bridge/ite-it6505.c +1 -1
@@ -22,12 +22,12 @@#include <crypto/hash.h> #include <drm/display/drm_dp_helper.h> +#include <drm/display/drm_hdcp_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_edid.h> -#include <drm/drm_hdcp.h> #include <drm/drm_print.h> #include <drm/drm_probe_helper.h>
drivers/gpu/drm/display/Kconfig +6 -0
@@ -17,6 +17,12 @@ config DRM_DISPLAY_DP_HELPER help DRM display helpers for DisplayPort. +config DRM_DISPLAY_HDCP_HELPER + bool + select DRM_DISPLAY_HELPER + help + DRM display helpers for HDCP. + config DRM_DP_AUX_CHARDEV bool "DRM DP AUX Interface" depends on DRM
drivers/gpu/drm/display/Makefile +1 -0
@@ -7,6 +7,7 @@ drm_display_helper-$(CONFIG_DRM_DISPLAY_DP_HELPER) += drm_dp_dual_mode_helper.o drm_dp_helper.o \ drm_dp_mst_topology.o \ drm_dsc_helper.o +drm_display_helper-$(CONFIG_DRM_DISPLAY_HDCP_HELPER) += drm_hdcp_helper.o drm_display_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o drm_display_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o
drivers/gpu/drm/display/drm_hdcp_helper.c renamed from drivers/gpu/drm/drm_hdcp.c +1 -3
@@ -13,7 +13,7 @@#include <linux/slab.h> #include <linux/firmware.h> -#include <drm/drm_hdcp.h> +#include <drm/display/drm_hdcp_helper.h> #include <drm/drm_sysfs.h> #include <drm/drm_print.h> #include <drm/drm_device.h>
@@ -21,8 +21,6 @@#include <drm/drm_mode_object.h> #include <drm/drm_connector.h> -#include "drm_internal.h" -static inline void drm_hdcp_print_ksv (const u8 *ksv) { DRM_DEBUG("\t%#02x, %#02x, %#02x, %#02x, %#02x\n",
drivers/gpu/drm/i915/Kconfig +1 -0
@@ -11,6 +11,7 @@ config DRM_I915 select SHMEM select TMPFS select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HDCP_HELPER select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select DRM_PANEL
drivers/gpu/drm/i915/display/intel_dp_hdcp.c +1 -1
@@ -8,7 +8,7 @@#include <drm/display/drm_dp_helper.h> #include <drm/display/drm_dp_mst_helper.h> -#include <drm/drm_hdcp.h> +#include <drm/display/drm_hdcp_helper.h> #include <drm/drm_print.h> #include "intel_ddi.h"
drivers/gpu/drm/i915/display/intel_gmbus.c +1 -1
@@ -31,7 +31,7 @@#include <linux/i2c-algo-bit.h> #include <linux/i2c.h> -#include <drm/drm_hdcp.h> +#include <drm/display/drm_hdcp_helper.h> #include "i915_drv.h" #include "intel_de.h"
drivers/gpu/drm/i915/display/intel_hdcp.c +1 -1
@@ -12,7 +12,7 @@#include <linux/i2c.h> #include <linux/random.h> -#include <drm/drm_hdcp.h> +#include <drm/display/drm_hdcp_helper.h> #include <drm/i915_component.h> #include "i915_drv.h"
drivers/gpu/drm/i915/display/intel_hdmi.c +1 -1
@@ -32,10 +32,10 @@#include <linux/slab.h> #include <linux/string_helpers.h> +#include <drm/display/drm_hdcp_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> #include <drm/drm_edid.h> -#include <drm/drm_hdcp.h> #include <drm/drm_scdc_helper.h> #include <drm/intel_lpe_audio.h>
drivers/misc/mei/hdcp/mei_hdcp.h +1 -1
@@ -9,7 +9,7 @@#ifndef __MEI_HDCP_H__#define __MEI_HDCP_H__ -#include <drm/drm_hdcp.h> +#include <drm/display/drm_hdcp.h> /* me_hdcp_status: Enumeration of all HDCP Status Codes */ enum me_hdcp_status {
include/drm/display/drm_hdcp.h renamed from include/drm/drm_hdcp.h +2 -12
@@ -6,8 +6,8 @@* Sean Paul <[email protected]> */ -#ifndef _DRM_HDCP_H_INCLUDED_ -#define _DRM_HDCP_H_INCLUDED_ +#ifndef _DRM_HDCP_H_ +#define _DRM_HDCP_H_#include <linux/types.h>
@@ -291,16 +291,6 @@ struct hdcp_srm_header {u8 srm_gen_no; } __packed; -struct drm_device ; -struct drm_connector ; - -int drm_hdcp_check_ksvs_revoked (struct drm_device *dev, -u8 *ksvs,u32 ksv_count); -int drm_connector_attach_content_protection_property ( -struct drm_connector *connector,bool hdcp_content_type); -void drm_hdcp_update_content_protection (struct drm_connector *connector, -u64 val); -/* Content Type classification for HDCP2.2 vs others */ #define DRM_MODE_HDCP_CONTENT_TYPE0 0#define DRM_MODE_HDCP_CONTENT_TYPE1 1
include/drm/display/drm_hdcp_helper.h new file +22 -0
@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright (C) 2017 Google, Inc. +* +* Authors: +* Sean Paul <[email protected]> +*/ + +#ifndef _DRM_HDCP_HELPER_H_INCLUDED_ +#define _DRM_HDCP_HELPER_H_INCLUDED_ + +#include <drm/display/drm_hdcp.h> + +struct drm_device ; +struct drm_connector ; + +int drm_hdcp_check_ksvs_revoked (struct drm_device *dev,u8 *ksvs,u32 ksv_count); +int drm_connector_attach_content_protection_property (struct drm_connector *connector, +bool hdcp_content_type); +void drm_hdcp_update_content_protection (struct drm_connector *connector,u64 val); + +#endif
include/drm/i915_mei_hdcp_interface.h +1 -1
@@ -11,7 +11,7 @@#include <linux/mutex.h> #include <linux/device.h> -#include <drm/drm_hdcp.h> +#include <drm/display/drm_hdcp.h> /** * enum hdcp_port_type - HDCP port implementation type defined by ME FW
Signature · 1 line
2.35.1
Thomas Zimmermann
maintainerPATCH v2 7/8 drm/display: Move HDMI helpers into display-helper module
In reply to Thomas ZimmermannMove DRM's HMDI helpers into the display/ subdirectoy and add it to DRM's display helpers. Update all affected drivers. No functional changes.
The HDMI helpers were implemented in the EDID and connector code, but are actually unrelated. With the move to the display-helper library, we can remove the dependency on drm_edid.{c,h} in some driver's HDMI source files.
Several of the HDMI helpers remain in EDID code because both share parts of their implementation internally. With better refractoring of the EDID code, those HDMI helpers could be moved into the display-helper library as well.
v2:
* reduce HDMI helpers to avoid exporting functions (Jani)
* fix include statements (Jani, Javier)
* update Kconfig symbols
--- drivers/gpu/drm/Kconfig | 2 + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 + drivers/gpu/drm/bridge/synopsys/Kconfig | 2 + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +- drivers/gpu/drm/display/Kconfig | 6 + drivers/gpu/drm/display/Makefile | 1 + drivers/gpu/drm/display/drm_hdmi_helper.c | 199 ++++++++++++++++++ drivers/gpu/drm/drm_connector.c | 34 --- drivers/gpu/drm/drm_edid.c | 159 -------------- drivers/gpu/drm/i915/Kconfig | 1 + drivers/gpu/drm/i915/display/intel_dp.c | 2 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 1 + drivers/gpu/drm/i915/display/intel_lspcon.c | 2 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 1 + drivers/gpu/drm/vc4/Kconfig | 2 + drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- include/drm/display/drm_hdmi_helper.h | 27 +++ include/drm/drm_connector.h | 3 - include/drm/drm_edid.h | 12 -- 19 files changed, 247 insertions(+), 212 deletions(-) create mode 100644 drivers/gpu/drm/display/drm_hdmi_helper.c create mode 100644 include/drm/display/drm_hdmi_helper.h
drivers/gpu/drm/Kconfig +2 -0
@@ -224,6 +224,7 @@ config DRM_RADEON depends on AGP || !AGP select FW_LOADER select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HDMI_HELPER select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select DRM_TTM
@@ -246,6 +247,7 @@ config DRM_AMDGPU depends on DRM && PCI && MMU select FW_LOADER select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HDMI_HELPER select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select DRM_SCHED
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -0
@@ -74,6 +74,7 @@#include <linux/component.h> #include <drm/display/drm_dp_mst_helper.h> +#include <drm/display/drm_hdmi_helper.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_uapi.h> #include <drm/drm_atomic_helper.h>
drivers/gpu/drm/bridge/synopsys/Kconfig +2 -0
@@ -1,6 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only config DRM_DW_HDMI tristate + select DRM_DISPLAY_HDMI_HELPER + select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select REGMAP_MMIO select CEC_CORE if CEC_NOTIFIER
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +1 -1
@@ -25,10 +25,10 @@#include <uapi/linux/videodev2.h> #include <drm/bridge/dw_hdmi.h> +#include <drm/display/drm_hdmi_helper.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> -#include <drm/drm_edid.h> #include <drm/drm_of.h> #include <drm/drm_print.h> #include <drm/drm_probe_helper.h>
drivers/gpu/drm/display/Kconfig +6 -0
@@ -23,6 +23,12 @@ config DRM_DISPLAY_HDCP_HELPER help DRM display helpers for HDCP. +config DRM_DISPLAY_HDMI_HELPER + bool + select DRM_DISPLAY_HELPER + help + DRM display helpers for HDMI. + config DRM_DP_AUX_CHARDEV bool "DRM DP AUX Interface" depends on DRM
drivers/gpu/drm/display/Makefile +1 -0
@@ -8,6 +8,7 @@ drm_display_helper-$(CONFIG_DRM_DISPLAY_DP_HELPER) += drm_dp_dual_mode_helper.o drm_dp_mst_topology.o \ drm_dsc_helper.o drm_display_helper-$(CONFIG_DRM_DISPLAY_HDCP_HELPER) += drm_hdcp_helper.o +drm_display_helper-$(CONFIG_DRM_DISPLAY_HDMI_HELPER) += drm_hdmi_helper.o drm_display_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o drm_display_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o
drivers/gpu/drm/display/drm_hdmi_helper.c new file +199 -0
199 lines not on this page · raw message
drivers/gpu/drm/drm_connector.c +0 -34
@@ -1486,40 +1486,6 @@ int drm_connector_attach_content_type_property(struct drm_connector *connector) }EXPORT_SYMBOL (drm_connector_attach_content_type_property); - -/** -* drm_hdmi_avi_infoframe_content_type() - fill the HDMI AVI infoframe -* content type information, based -* on correspondent DRM property. -* @frame: HDMI AVI infoframe -* @conn_state: DRM display connector state -* -*/ -void drm_hdmi_avi_infoframe_content_type (struct hdmi_avi_infoframe *frame, -const struct drm_connector_state *conn_state) -{ -switch (conn_state->content_type) { -case DRM_MODE_CONTENT_TYPE_GRAPHICS : - frame->content_type =HDMI_CONTENT_TYPE_GRAPHICS ; -break ; -case DRM_MODE_CONTENT_TYPE_CINEMA : - frame->content_type =HDMI_CONTENT_TYPE_CINEMA ; -break ; -case DRM_MODE_CONTENT_TYPE_GAME : - frame->content_type =HDMI_CONTENT_TYPE_GAME ; -break ; -case DRM_MODE_CONTENT_TYPE_PHOTO : - frame->content_type =HDMI_CONTENT_TYPE_PHOTO ; -break ; -default : -/* Graphics is the default(0) */ - frame->content_type =HDMI_CONTENT_TYPE_GRAPHICS ; - } - - frame->itc = conn_state->content_type !=DRM_MODE_CONTENT_TYPE_NO_DATA ; -} -EXPORT_SYMBOL (drm_hdmi_avi_infoframe_content_type); -/** * drm_connector_attach_tv_margin_properties - attach TV connector margin * properties
drivers/gpu/drm/drm_edid.c +0 -159
177 lines not on this page · raw message
drivers/gpu/drm/i915/Kconfig +1 -0
@@ -12,6 +12,7 @@ config DRM_I915 select TMPFS select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_HDCP_HELPER + select DRM_DISPLAY_HDMI_HELPER select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select DRM_PANEL
drivers/gpu/drm/i915/display/intel_dp.c +1 -1
@@ -37,9 +37,9 @@#include <drm/display/drm_dp_helper.h> #include <drm/display/drm_dsc_helper.h> +#include <drm/display/drm_hdmi_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> -#include <drm/drm_edid.h> #include <drm/drm_probe_helper.h> #include "g4x_dp.h"
drivers/gpu/drm/i915/display/intel_hdmi.c +1 -0
@@ -33,6 +33,7 @@#include <linux/string_helpers.h> #include <drm/display/drm_hdcp_helper.h> +#include <drm/display/drm_hdmi_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> #include <drm/drm_edid.h>
drivers/gpu/drm/i915/display/intel_lspcon.c +1 -1
@@ -24,8 +24,8 @@*/ #include <drm/display/drm_dp_dual_mode_helper.h> +#include <drm/display/drm_hdmi_helper.h> #include <drm/drm_atomic_helper.h> -#include <drm/drm_edid.h> #include "intel_de.h" #include "intel_display_types.h"
drivers/gpu/drm/i915/display/intel_sdvo.c +1 -0
@@ -31,6 +31,7 @@#include <linux/i2c.h> #include <linux/slab.h> +#include <drm/display/drm_hdmi_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> #include <drm/drm_edid.h>
drivers/gpu/drm/vc4/Kconfig +2 -0
@@ -5,6 +5,8 @@ config DRM_VC4 depends on DRM depends on SND && SND_SOC depends on COMMON_CLK + select DRM_DISPLAY_HDMI_HELPER + select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select DRM_GEM_CMA_HELPER select DRM_PANEL_BRIDGE
drivers/gpu/drm/vc4/vc4_hdmi.c +1 -1
@@ -31,8 +31,8 @@* encoder block has CEC support. */ +#include <drm/display/drm_hdmi_helper.h> #include <drm/drm_atomic_helper.h> -#include <drm/drm_edid.h> #include <drm/drm_probe_helper.h> #include <drm/drm_simple_kms_helper.h> #include <drm/drm_scdc_helper.h>
include/drm/display/drm_hdmi_helper.h new file +27 -0
@@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: MIT */ + +#ifndef DRM_HDMI_HELPER +#define DRM_HDMI_HELPER + +#include <linux/hdmi.h> + +struct drm_connector ; +struct drm_connector_state ; +struct drm_display_mode ; + +void +drm_hdmi_avi_infoframe_colorimetry (struct hdmi_avi_infoframe *frame, +const struct drm_connector_state *conn_state); + +void +drm_hdmi_avi_infoframe_bars (struct hdmi_avi_infoframe *frame, +const struct drm_connector_state *conn_state); + +int +drm_hdmi_infoframe_set_hdr_metadata (struct hdmi_drm_infoframe *frame, +const struct drm_connector_state *conn_state); + +void drm_hdmi_avi_infoframe_content_type (struct hdmi_avi_infoframe *frame, +const struct drm_connector_state *conn_state); + +#endif
include/drm/drm_connector.h +0 -3
@@ -1784,9 +1784,6 @@ int drm_mode_create_aspect_ratio_property(struct drm_device *dev);int drm_mode_create_hdmi_colorspace_property (struct drm_connector *connector);int drm_mode_create_dp_colorspace_property (struct drm_connector *connector);int drm_mode_create_content_type_property (struct drm_device *dev); -void drm_hdmi_avi_infoframe_content_type (struct hdmi_avi_infoframe *frame, -const struct drm_connector_state *conn_state); -int drm_mode_create_suggested_offset_properties (struct drm_device *dev); int drm_connector_set_path_property(struct drm_connector *connector,
include/drm/drm_edid.h +0 -12
@@ -400,24 +400,12 @@ drm_hdmi_vendor_infoframe_from_display_mode(struct hdmi_vendor_infoframe *frame,const struct drm_connector *connector, const struct drm_display_mode *mode); -void -drm_hdmi_avi_infoframe_colorimetry (struct hdmi_avi_infoframe *frame, -const struct drm_connector_state *conn_state); - -void -drm_hdmi_avi_infoframe_bars (struct hdmi_avi_infoframe *frame, -const struct drm_connector_state *conn_state); -void drm_hdmi_avi_infoframe_quant_range (struct hdmi_avi_infoframe *frame,const struct drm_connector *connector,const struct drm_display_mode *mode,enum hdmi_quantization_range rgb_quant_range); -int -drm_hdmi_infoframe_set_hdr_metadata (struct hdmi_drm_infoframe *frame, -const struct drm_connector_state *conn_state); -/** * drm_eld_mnl - Get ELD monitor name length in bytes. * @eld: pointer to an eld memory structure with mnl set
Signature · 1 line
2.35.1
Re: [PATCH v2 7/8] drm/display: Move HDMI helpers into display-helper module
Hello Thomas,
On 4/20/22 13:08, Thomas Zimmermann wrote:
[snip]
Quoted 11 lines
drivers/gpu/drm/bridge/synopsys/Kconfig +2
-0@@ -1,6 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only config DRM_DW_HDMI tristate + select DRM_DISPLAY_HDMI_HELPER + select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select REGMAP_MMIO select CEC_CORE if CEC_NOTIFIER
[snip]
drivers/gpu/drm/bridge/synopsys/Kconfig
Quoted 6 lines
drivers/gpu/drm/bridge/synopsys/Kconfig +6
-0+config DRM_DISPLAY_HDMI_HELPER + bool + select DRM_DISPLAY_HELPER + help + DRM display helpers for HDMI. +
Maybe you mentioned already when we discussed it in v1, but could you please remember me why we need to select both symbols for the drivers, even when DRM_DISPLAY_HELPER is already selected here ?
Or are select operations not transitive ?
Signature · 5 lines
Best regards, Javier Martinez Canillas Linux Engineering Red Hat
Thomas Zimmermann
maintainerRe: [PATCH v2 7/8] drm/display: Move HDMI helpers into display-helper module
Hi
Am 20.04.22 um 14:02 schrieb Javier Martinez Canillas:
Quoted 31 lines
Hello Thomas,
On 4/20/22 13:08, Thomas Zimmermann wrote:
[snip]
Quoted 11 lines
drivers/gpu/drm/bridge/synopsys/Kconfig +2
-0@@ -1,6 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only config DRM_DW_HDMI tristate + select DRM_DISPLAY_HDMI_HELPER + select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select REGMAP_MMIO select CEC_CORE if CEC_NOTIFIER[snip]
drivers/gpu/drm/bridge/synopsys/Kconfig
Quoted 6 lines
drivers/gpu/drm/bridge/synopsys/Kconfig +6
-0+config DRM_DISPLAY_HDMI_HELPER + bool + select DRM_DISPLAY_HELPER + help + DRM display helpers for HDMI. +Maybe you mentioned already when we discussed it in v1, but could you please remember me why we need to select both symbols for the drivers, even when
DRM_DISPLAY_HELPERis already selected here ?
Quoted 1 line
Or are select operations not transitive ?
DRM_DISPLAY_HELPER enables the module itself. It's tristate. DRM_DISPLAY_HDMI_HELPER, DRM_DISPLAY_DP_HELPER, etc are the individual features of the helper module. Each is a boolean. Drivers can enable them according to their needs. This split allows linking correctly in all cases, even if some drivers are built-in and others are modules. This didn't always work with the original patches.
Best regards
Thomas
Quoted 1 line
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
Re: [PATCH v2 7/8] drm/display: Move HDMI helpers into display-helper module
Quoted 34 lines · Thomas Zimmermann
Hi
Am 20.04.22 um 14:02 schrieb Javier Martinez Canillas:
Quoted 31 lines
Hello Thomas,
On 4/20/22 13:08, Thomas Zimmermann wrote:
[snip]
Quoted 11 lines
drivers/gpu/drm/bridge/synopsys/Kconfig +2
-0@@ -1,6 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only config DRM_DW_HDMI tristate + select DRM_DISPLAY_HDMI_HELPER + select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select REGMAP_MMIO select CEC_CORE if CEC_NOTIFIER[snip]
drivers/gpu/drm/bridge/synopsys/Kconfig
Quoted 6 lines
drivers/gpu/drm/bridge/synopsys/Kconfig +6
-0+config DRM_DISPLAY_HDMI_HELPER + bool + select DRM_DISPLAY_HELPER + help + DRM display helpers for HDMI. +Maybe you mentioned already when we discussed it in v1, but could you please remember me why we need to select both symbols for the drivers, even when
DRM_DISPLAY_HELPERis already selected here ?
Quoted 9 lines
Quoted 1 line
Or are select operations not transitive ?
DRM_DISPLAY_HELPERenables the module itself. It's tristate.DRM_DISPLAY_HDMI_HELPER,DRM_DISPLAY_DP_HELPER, etc are the individual features of the helper module. Each is a boolean. Drivers can enable them according to their needs. This split allows linking correctly in all cases, even if some drivers are built-in and others are modules. This didn't always work with the original patches.
Right, but that wasn't my question. I wondered why for example DRM_DW_HDMI Kconfig needs to select both DRM_DISPLAY_HDMI_HELPER and DRM_DISPLAY_HELPER since DRM_DISPLAY_HDMI_HELPER already selects DRM_DISPLAY_HELPER.
Signature · 5 lines
Best regards, Javier Martinez Canillas Linux Engineering Red Hat
Thomas Zimmermann
maintainerRe: [PATCH v2 7/8] drm/display: Move HDMI helpers into display-helper module
Hi
Am 20.04.22 um 14:26 schrieb Javier Martinez Canillas:
Quoted 44 lines · Thomas Zimmermann
Quoted 34 lines
Hi
Am 20.04.22 um 14:02 schrieb Javier Martinez Canillas:
Quoted 31 lines
Hello Thomas,
On 4/20/22 13:08, Thomas Zimmermann wrote:
[snip]
Quoted 11 lines
drivers/gpu/drm/bridge/synopsys/Kconfig +2
-0@@ -1,6 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only config DRM_DW_HDMI tristate + select DRM_DISPLAY_HDMI_HELPER + select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select REGMAP_MMIO select CEC_CORE if CEC_NOTIFIER[snip]
drivers/gpu/drm/bridge/synopsys/Kconfig
Quoted 6 lines
drivers/gpu/drm/bridge/synopsys/Kconfig +6
-0+config DRM_DISPLAY_HDMI_HELPER + bool + select DRM_DISPLAY_HELPER + help + DRM display helpers for HDMI. +Maybe you mentioned already when we discussed it in v1, but could you please remember me why we need to select both symbols for the drivers, even when
DRM_DISPLAY_HELPERis already selected here ?Quoted 9 lines
Quoted 1 line
Or are select operations not transitive ?
DRM_DISPLAY_HELPERenables the module itself. It's tristate.DRM_DISPLAY_HDMI_HELPER,DRM_DISPLAY_DP_HELPER, etc are the individual features of the helper module. Each is a boolean. Drivers can enable them according to their needs. This split allows linking correctly in all cases, even if some drivers are built-in and others are modules. This didn't always work with the original patches.
Quoted 4 lines
Right, but that wasn't my question. I wondered why for example
DRM_DW_HDMIKconfigneeds to select bothDRM_DISPLAY_HDMI_HELPERandDRM_DISPLAY_HELPERsinceDRM_DISPLAY_HDMI_HELPERalready selectsDRM_DISPLAY_HELPER.
Oh, well. You found a bug. It should be 'depends on' instead of 'select'.
Best regards
Thomas
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
Re: [PATCH v2 7/8] drm/display: Move HDMI helpers into display-helper module
On 4/20/22 15:12, Thomas Zimmermann wrote:
[snip]
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Right, but that wasn't my question. I wondered why for example
DRM_DW_HDMIKconfigneeds to select bothDRM_DISPLAY_HDMI_HELPERandDRM_DISPLAY_HELPERsinceDRM_DISPLAY_HDMI_HELPERalready selectsDRM_DISPLAY_HELPER.Oh, well. You found a bug. It should be 'depends on' instead of 'select'.
Ah, I see. Yeah, that makes more sense.
Signature · 5 lines
Best regards, Javier Martinez Canillas Linux Engineering Red Hat
Thomas Zimmermann
maintainerPATCH v2 8/8 drm/display: Move SCDC helpers into display-helper library
In reply to Thomas ZimmermannSCDC is the Status and Control Data Channel for HDMI. Move the SCDC helpers into display/ and split the header into files for core and helpers. Update all affected drivers. No functional changes.
To avoid the proliferation of Kconfig options, SCDC is part of DRM's support for HDMI. If necessary, a new option could make SCDC an independent feature.
---
Documentation/gpu/drm-kms-helpers.rst | 6 +-
drivers/gpu/drm/Makefile | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +-
drivers/gpu/drm/display/Makefile | 3 +-
.../gpu/drm/{ => display}/drm_scdc_helper.c | 3 +-
drivers/gpu/drm/drm_edid.c | 1 -
drivers/gpu/drm/i915/display/intel_ddi.c | 2 +-
drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +-
drivers/gpu/drm/nouveau/Kconfig | 1 +
drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +-
drivers/gpu/drm/tegra/Kconfig | 1 +
drivers/gpu/drm/tegra/sor.c | 2 +-
drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
.../{drm_scdc_helper.h => display/drm_scdc.h} | 52 +-----------
include/drm/display/drm_scdc_helper.h | 79 +++++++++++++++++++
15 files changed, 97 insertions(+), 63 deletions(-)
rename drivers/gpu/drm/{ => display}/drm_scdc_helper.c (99%)
rename include/drm/{drm_scdc_helper.h => display/drm_scdc.h} (65%)
create mode 100644 include/drm/display/drm_scdc_helper.hDocumentation/gpu/drm-kms-helpers.rst +3 -3
@@ -356,13 +356,13 @@ EDID Helper Functions Reference SCDC Helper Functions Reference =============================== -.. kernel-doc:: drivers/gpu/drm/drm_scdc_helper.c +.. kernel-doc:: drivers/gpu/drm/display/drm_scdc_helper.c :doc: scdc helpers -.. kernel-doc:: include/drm/drm_scdc_helper.h +.. kernel-doc:: include/drm/display/drm_scdc_helper.h :internal: -.. kernel-doc:: drivers/gpu/drm/drm_scdc_helper.c +.. kernel-doc:: drivers/gpu/drm/display/drm_scdc_helper.c :export: HDMI Infoframes Helper Reference
drivers/gpu/drm/Makefile +1 -1
@@ -63,7 +63,7 @@ drm_kms_helper-y := drm_bridge_connector.o drm_crtc_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_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
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +1 -1
@@ -26,13 +26,13 @@#include <drm/bridge/dw_hdmi.h> #include <drm/display/drm_hdmi_helper.h> +#include <drm/display/drm_scdc_helper.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_of.h> #include <drm/drm_print.h> #include <drm/drm_probe_helper.h> -#include <drm/drm_scdc_helper.h> #include "dw-hdmi-audio.h" #include "dw-hdmi-cec.h"
drivers/gpu/drm/display/Makefile +2 -1
@@ -8,7 +8,8 @@ drm_display_helper-$(CONFIG_DRM_DISPLAY_DP_HELPER) += drm_dp_dual_mode_helper.o drm_dp_mst_topology.o \ drm_dsc_helper.o drm_display_helper-$(CONFIG_DRM_DISPLAY_HDCP_HELPER) += drm_hdcp_helper.o -drm_display_helper-$(CONFIG_DRM_DISPLAY_HDMI_HELPER) += drm_hdmi_helper.o +drm_display_helper-$(CONFIG_DRM_DISPLAY_HDMI_HELPER) += drm_hdmi_helper.o \ + drm_scdc_helper.o drm_display_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o drm_display_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o
drivers/gpu/drm/display/drm_scdc_helper.c renamed from drivers/gpu/drm/drm_scdc_helper.c +2 -1
@@ -21,11 +21,12 @@* DEALINGS IN THE SOFTWARE. */ +#include <linux/i2c.h> #include <linux/slab.h> #include <linux/delay.h> +#include <drm/display/drm_scdc_helper.h> #include <drm/drm_print.h> -#include <drm/drm_scdc_helper.h> /** * DOC: scdc helpers
drivers/gpu/drm/drm_edid.c +0 -1
@@ -42,7 +42,6 @@#include <drm/drm_edid.h> #include <drm/drm_encoder.h> #include <drm/drm_print.h> -#include <drm/drm_scdc_helper.h> #include "drm_crtc_internal.h"
drivers/gpu/drm/i915/display/intel_ddi.c +1 -1
@@ -27,8 +27,8 @@#include <linux/string_helpers.h> +#include <drm/display/drm_scdc_helper.h> #include <drm/drm_privacy_screen_consumer.h> -#include <drm/drm_scdc_helper.h> #include "i915_drv.h" #include "intel_audio.h"
drivers/gpu/drm/i915/display/intel_hdmi.c +1 -1
@@ -34,10 +34,10 @@#include <drm/display/drm_hdcp_helper.h> #include <drm/display/drm_hdmi_helper.h> +#include <drm/display/drm_scdc_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> #include <drm/drm_edid.h> -#include <drm/drm_scdc_helper.h> #include <drm/intel_lpe_audio.h> #include "i915_debugfs.h"
drivers/gpu/drm/nouveau/Kconfig +1 -0
@@ -5,6 +5,7 @@ config DRM_NOUVEAU select IOMMU_API select FW_LOADER select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HDMI_HELPER select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select DRM_TTM
drivers/gpu/drm/nouveau/dispnv50/disp.c +1 -1
@@ -34,13 +34,13 @@#include <linux/iopoll.h> #include <drm/display/drm_dp_helper.h> +#include <drm/display/drm_scdc_helper.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_edid.h> #include <drm/drm_fb_helper.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> -#include <drm/drm_scdc_helper.h> #include <drm/drm_vblank.h> #include <nvif/push507c.h>
drivers/gpu/drm/tegra/Kconfig +1 -0
@@ -6,6 +6,7 @@ config DRM_TEGRA depends on DRM depends on OF select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HDMI_HELPER select DRM_DISPLAY_HELPER select DRM_DP_AUX_BUS select DRM_KMS_HELPER
drivers/gpu/drm/tegra/sor.c +1 -1
@@ -17,11 +17,11 @@#include <soc/tegra/pmc.h> #include <drm/display/drm_dp_helper.h> +#include <drm/display/drm_scdc_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_debugfs.h> #include <drm/drm_file.h> #include <drm/drm_panel.h> -#include <drm/drm_scdc_helper.h> #include <drm/drm_simple_kms_helper.h> #include "dc.h"
drivers/gpu/drm/vc4/vc4_hdmi.c +1 -1
@@ -32,10 +32,10 @@*/ #include <drm/display/drm_hdmi_helper.h> +#include <drm/display/drm_scdc_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_probe_helper.h> #include <drm/drm_simple_kms_helper.h> -#include <drm/drm_scdc_helper.h> #include <linux/clk.h> #include <linux/component.h> #include <linux/i2c.h>
include/drm/display/drm_scdc.h renamed from include/drm/drm_scdc_helper.h +2 -50
62 lines not on this page · raw message
include/drm/display/drm_scdc_helper.h new file +79 -0
79 lines not on this page · raw message
Signature · 1 line
2.35.1
Re: [PATCH v2 8/8] drm/display: Move SCDC helpers into display-helper library
Quoted 10 lines · Thomas Zimmermann
SCDC is the Status and Control Data Channel for HDMI. Move the SCDC helpers into display/ and split the header into files for core and helpers. Update all affected drivers. No functional changes.
To avoid the proliferation of
Kconfigoptions, SCDC is part of DRM's support for HDMI. If necessary, a new option could make SCDC an independent feature.Signed-off-by Thomas Zimmermann <[email protected]>---
Looks good to me.
Signature · 5 lines
Best regards, Javier Martinez Canillas Linux Engineering Red Hat