tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drm: Rename dp/ to display/

Rename 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)

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220421073108.19226-3-tzimmermann@suse.de

Thomas Zimmermann da68386d c6eafc99

+106 -98
+13 -13
Documentation/gpu/drm-kms-helpers.rst
··· 232 232 Display Port Helper Functions Reference 233 233 ======================================= 234 234 235 - .. kernel-doc:: drivers/gpu/drm/dp/drm_dp.c 235 + .. kernel-doc:: drivers/gpu/drm/display/drm_dp_helper.c 236 236 :doc: dp helpers 237 237 238 - .. kernel-doc:: include/drm/dp/drm_dp_helper.h 238 + .. kernel-doc:: include/drm/display/drm_dp_helper.h 239 239 :internal: 240 240 241 - .. kernel-doc:: drivers/gpu/drm/dp/drm_dp.c 241 + .. kernel-doc:: drivers/gpu/drm/display/drm_dp_helper.c 242 242 :export: 243 243 244 244 Display Port CEC Helper Functions Reference 245 245 =========================================== 246 246 247 - .. kernel-doc:: drivers/gpu/drm/dp/drm_dp_cec.c 247 + .. kernel-doc:: drivers/gpu/drm/display/drm_dp_cec.c 248 248 :doc: dp cec helpers 249 249 250 - .. kernel-doc:: drivers/gpu/drm/dp/drm_dp_cec.c 250 + .. kernel-doc:: drivers/gpu/drm/display/drm_dp_cec.c 251 251 :export: 252 252 253 253 Display Port Dual Mode Adaptor Helper Functions Reference 254 254 ========================================================= 255 255 256 - .. kernel-doc:: drivers/gpu/drm/dp/drm_dp_dual_mode_helper.c 256 + .. kernel-doc:: drivers/gpu/drm/display/drm_dp_dual_mode_helper.c 257 257 :doc: dp dual mode helpers 258 258 259 - .. kernel-doc:: include/drm/dp/drm_dp_dual_mode_helper.h 259 + .. kernel-doc:: include/drm/display/drm_dp_dual_mode_helper.h 260 260 :internal: 261 261 262 - .. kernel-doc:: drivers/gpu/drm/dp/drm_dp_dual_mode_helper.c 262 + .. kernel-doc:: drivers/gpu/drm/display/drm_dp_dual_mode_helper.c 263 263 :export: 264 264 265 265 Display Port MST Helpers ··· 268 268 Overview 269 269 -------- 270 270 271 - .. kernel-doc:: drivers/gpu/drm/dp/drm_dp_mst_topology.c 271 + .. kernel-doc:: drivers/gpu/drm/display/drm_dp_mst_topology.c 272 272 :doc: dp mst helper 273 273 274 - .. kernel-doc:: drivers/gpu/drm/dp/drm_dp_mst_topology.c 274 + .. kernel-doc:: drivers/gpu/drm/display/drm_dp_mst_topology.c 275 275 :doc: Branch device and port refcounting 276 276 277 277 Functions Reference 278 278 ------------------- 279 279 280 - .. kernel-doc:: include/drm/dp/drm_dp_mst_helper.h 280 + .. kernel-doc:: include/drm/display/drm_dp_mst_helper.h 281 281 :internal: 282 282 283 - .. kernel-doc:: drivers/gpu/drm/dp/drm_dp_mst_topology.c 283 + .. kernel-doc:: drivers/gpu/drm/display/drm_dp_mst_topology.c 284 284 :export: 285 285 286 286 Topology Lifetime Internals ··· 289 289 These functions aren't exported to drivers, but are documented here to help make 290 290 the MST topology helpers easier to understand 291 291 292 - .. kernel-doc:: drivers/gpu/drm/dp/drm_dp_mst_topology.c 292 + .. kernel-doc:: drivers/gpu/drm/display/drm_dp_mst_topology.c 293 293 :functions: drm_dp_mst_topology_try_get_mstb drm_dp_mst_topology_get_mstb 294 294 drm_dp_mst_topology_put_mstb 295 295 drm_dp_mst_topology_try_get_port drm_dp_mst_topology_get_port
+1 -1
drivers/gpu/drm/Makefile
··· 80 80 obj-$(CONFIG_DRM_MIPI_DBI) += drm_mipi_dbi.o 81 81 obj-$(CONFIG_DRM_MIPI_DSI) += drm_mipi_dsi.o 82 82 obj-y += arm/ 83 - obj-y += dp/ 83 + obj-y += display/ 84 84 obj-$(CONFIG_DRM_TTM) += ttm/ 85 85 obj-$(CONFIG_DRM_SCHED) += scheduler/ 86 86 obj-$(CONFIG_DRM_TDFX) += tdfx/
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
··· 24 24 * Alex Deucher 25 25 */ 26 26 27 + #include <drm/display/drm_dp_helper.h> 27 28 #include <drm/drm_edid.h> 28 29 #include <drm/drm_fb_helper.h> 29 - #include <drm/dp/drm_dp_helper.h> 30 30 #include <drm/drm_probe_helper.h> 31 31 #include <drm/amdgpu_drm.h> 32 32 #include "amdgpu.h"
+2 -2
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
··· 30 30 #ifndef AMDGPU_MODE_H 31 31 #define AMDGPU_MODE_H 32 32 33 + #include <drm/display/drm_dp_helper.h> 33 34 #include <drm/drm_crtc.h> 34 35 #include <drm/drm_edid.h> 35 36 #include <drm/drm_encoder.h> 36 - #include <drm/dp/drm_dp_helper.h> 37 37 #include <drm/drm_fixed.h> 38 38 #include <drm/drm_crtc_helper.h> 39 39 #include <drm/drm_fb_helper.h> ··· 44 44 #include <linux/hrtimer.h> 45 45 #include "amdgpu_irq.h" 46 46 47 - #include <drm/dp/drm_dp_mst_helper.h> 47 + #include <drm/display/drm_dp_mst_helper.h> 48 48 #include "modules/inc/mod_freesync.h" 49 49 #include "amdgpu_dm_irq_params.h" 50 50
+2 -1
drivers/gpu/drm/amd/amdgpu/atombios_dp.c
··· 26 26 */ 27 27 28 28 #include <drm/amdgpu_drm.h> 29 + #include <drm/display/drm_dp_helper.h> 30 + 29 31 #include "amdgpu.h" 30 32 31 33 #include "atom.h" ··· 36 34 #include "atombios_dp.h" 37 35 #include "amdgpu_connectors.h" 38 36 #include "amdgpu_atombios.h" 39 - #include <drm/dp/drm_dp_helper.h> 40 37 41 38 /* move these to drm_dp_helper.c/h */ 42 39 #define DP_LINK_CONFIGURATION_SIZE 9
+1 -1
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
··· 73 73 #include <linux/firmware.h> 74 74 #include <linux/component.h> 75 75 76 + #include <drm/display/drm_dp_mst_helper.h> 76 77 #include <drm/drm_atomic.h> 77 78 #include <drm/drm_atomic_uapi.h> 78 79 #include <drm/drm_atomic_helper.h> 79 - #include <drm/dp/drm_dp_mst_helper.h> 80 80 #include <drm/drm_fb_helper.h> 81 81 #include <drm/drm_fourcc.h> 82 82 #include <drm/drm_edid.h>
+1 -1
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
··· 26 26 #ifndef __AMDGPU_DM_H__ 27 27 #define __AMDGPU_DM_H__ 28 28 29 + #include <drm/display/drm_dp_mst_helper.h> 29 30 #include <drm/drm_atomic.h> 30 31 #include <drm/drm_connector.h> 31 32 #include <drm/drm_crtc.h> 32 - #include <drm/dp/drm_dp_mst_helper.h> 33 33 #include <drm/drm_plane.h> 34 34 35 35 /*
+2 -2
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
··· 23 23 * 24 24 */ 25 25 26 + #include <drm/display/drm_dp_helper.h> 27 + #include <drm/display/drm_dp_mst_helper.h> 26 28 #include <drm/drm_atomic.h> 27 29 #include <drm/drm_atomic_helper.h> 28 - #include <drm/dp/drm_dp_mst_helper.h> 29 - #include <drm/dp/drm_dp_helper.h> 30 30 #include "dm_services.h" 31 31 #include "amdgpu.h" 32 32 #include "amdgpu_dm.h"
+1 -1
drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c
··· 25 25 #include <drm/drm_dsc.h> 26 26 #include "dc_hw_types.h" 27 27 #include "dsc.h" 28 - #include <drm/dp/drm_dp_helper.h> 28 + #include <drm/display/drm_dp_helper.h> 29 29 #include "dc.h" 30 30 #include "rc_calc.h" 31 31 #include "fixed31_32.h"
+1 -1
drivers/gpu/drm/amd/display/dc/os_types.h
··· 35 35 36 36 #include <asm/byteorder.h> 37 37 38 + #include <drm/display/drm_dp_helper.h> 38 39 #include <drm/drm_print.h> 39 - #include <drm/dp/drm_dp_helper.h> 40 40 41 41 #include "cgs_common.h" 42 42
+1 -1
drivers/gpu/drm/amd/display/include/dpcd_defs.h
··· 26 26 #ifndef __DAL_DPCD_DEFS_H__ 27 27 #define __DAL_DPCD_DEFS_H__ 28 28 29 - #include <drm/dp/drm_dp_helper.h> 29 + #include <drm/display/drm_dp_helper.h> 30 30 #ifndef DP_SINK_HW_REVISION_START // can remove this once the define gets into linux drm_dp_helper.h 31 31 #define DP_SINK_HW_REVISION_START 0x409 32 32 #endif
+1 -1
drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h
··· 29 29 #include "mod_hdcp.h" 30 30 #include "hdcp_log.h" 31 31 32 + #include <drm/display/drm_dp_helper.h> 32 33 #include <drm/drm_hdcp.h> 33 - #include <drm/dp/drm_dp_helper.h> 34 34 35 35 enum mod_hdcp_trans_input_result { 36 36 UNKNOWN = 0,
+1 -1
drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
··· 18 18 #include <linux/regulator/consumer.h> 19 19 #include <linux/types.h> 20 20 21 + #include <drm/display/drm_dp_helper.h> 21 22 #include <drm/drm_atomic_helper.h> 22 23 #include <drm/drm_bridge.h> 23 24 #include <drm/drm_crtc.h> 24 25 #include <drm/drm_crtc_helper.h> 25 - #include <drm/dp/drm_dp_helper.h> 26 26 #include <drm/drm_edid.h> 27 27 #include <drm/drm_of.h> 28 28 #include <drm/drm_panel.h>
+1 -1
drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
··· 18 18 #include <linux/regulator/consumer.h> 19 19 #include <linux/types.h> 20 20 21 + #include <drm/display/drm_dp_helper.h> 21 22 #include <drm/drm_atomic_helper.h> 22 23 #include <drm/drm_bridge.h> 23 24 #include <drm/drm_crtc.h> 24 - #include <drm/dp/drm_dp_helper.h> 25 25 #include <drm/drm_edid.h> 26 26 #include <drm/drm_print.h> 27 27 #include <drm/drm_probe_helper.h>
+1 -1
drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c
··· 7 7 */ 8 8 #include <linux/regmap.h> 9 9 10 + #include <drm/display/drm_dp_helper.h> 10 11 #include <drm/drm.h> 11 - #include <drm/dp/drm_dp_helper.h> 12 12 #include <drm/drm_print.h> 13 13 14 14 #include "analogix-i2c-dptx.h"
+1 -1
drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
··· 9 9 #ifndef _ANALOGIX_DP_CORE_H 10 10 #define _ANALOGIX_DP_CORE_H 11 11 12 + #include <drm/display/drm_dp_helper.h> 12 13 #include <drm/drm_crtc.h> 13 - #include <drm/dp/drm_dp_helper.h> 14 14 15 15 #define DP_TIMEOUT_LOOP_COUNT 100 16 16 #define MAX_CR_LOOP 5
+2 -2
drivers/gpu/drm/bridge/analogix/anx7625.c
··· 21 21 #include <linux/of_graph.h> 22 22 #include <linux/of_platform.h> 23 23 24 + #include <drm/display/drm_dp_aux_bus.h> 25 + #include <drm/display/drm_dp_helper.h> 24 26 #include <drm/drm_atomic_helper.h> 25 27 #include <drm/drm_bridge.h> 26 28 #include <drm/drm_crtc_helper.h> 27 - #include <drm/dp/drm_dp_aux_bus.h> 28 - #include <drm/dp/drm_dp_helper.h> 29 29 #include <drm/drm_edid.h> 30 30 #include <drm/drm_hdcp.h> 31 31 #include <drm/drm_mipi_dsi.h>
+1 -1
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
··· 35 35 #include <linux/slab.h> 36 36 #include <linux/wait.h> 37 37 38 + #include <drm/display/drm_dp_helper.h> 38 39 #include <drm/drm_atomic.h> 39 40 #include <drm/drm_atomic_helper.h> 40 41 #include <drm/drm_atomic_state_helper.h> 41 42 #include <drm/drm_bridge.h> 42 43 #include <drm/drm_connector.h> 43 44 #include <drm/drm_crtc_helper.h> 44 - #include <drm/dp/drm_dp_helper.h> 45 45 #include <drm/drm_hdcp.h> 46 46 #include <drm/drm_modeset_helper_vtables.h> 47 47 #include <drm/drm_print.h>
+1 -1
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.h
··· 15 15 #include <linux/mutex.h> 16 16 #include <linux/spinlock.h> 17 17 18 + #include <drm/display/drm_dp_helper.h> 18 19 #include <drm/drm_bridge.h> 19 20 #include <drm/drm_connector.h> 20 - #include <drm/dp/drm_dp_helper.h> 21 21 22 22 struct clk; 23 23 struct device;
+1 -1
drivers/gpu/drm/bridge/ite-it6505.c
··· 21 21 22 22 #include <crypto/hash.h> 23 23 24 - #include <drm/dp/drm_dp_helper.h> 24 + #include <drm/display/drm_dp_helper.h> 25 25 #include <drm/drm_atomic_helper.h> 26 26 #include <drm/drm_bridge.h> 27 27 #include <drm/drm_crtc.h>
+2 -2
drivers/gpu/drm/bridge/parade-ps8640.c
··· 13 13 #include <linux/regmap.h> 14 14 #include <linux/regulator/consumer.h> 15 15 16 + #include <drm/display/drm_dp_aux_bus.h> 17 + #include <drm/display/drm_dp_helper.h> 16 18 #include <drm/drm_bridge.h> 17 - #include <drm/dp/drm_dp_aux_bus.h> 18 - #include <drm/dp/drm_dp_helper.h> 19 19 #include <drm/drm_mipi_dsi.h> 20 20 #include <drm/drm_of.h> 21 21 #include <drm/drm_panel.h>
+1 -1
drivers/gpu/drm/bridge/tc358767.c
··· 31 31 #include <linux/regmap.h> 32 32 #include <linux/slab.h> 33 33 34 + #include <drm/display/drm_dp_helper.h> 34 35 #include <drm/drm_atomic_helper.h> 35 36 #include <drm/drm_bridge.h> 36 - #include <drm/dp/drm_dp_helper.h> 37 37 #include <drm/drm_edid.h> 38 38 #include <drm/drm_mipi_dsi.h> 39 39 #include <drm/drm_of.h>
+1 -1
drivers/gpu/drm/bridge/tc358775.c
··· 19 19 20 20 #include <asm/unaligned.h> 21 21 22 + #include <drm/display/drm_dp_helper.h> 22 23 #include <drm/drm_atomic_helper.h> 23 24 #include <drm/drm_bridge.h> 24 25 #include <drm/drm_crtc_helper.h> 25 - #include <drm/dp/drm_dp_helper.h> 26 26 #include <drm/drm_mipi_dsi.h> 27 27 #include <drm/drm_of.h> 28 28 #include <drm/drm_panel.h>
+2 -2
drivers/gpu/drm/bridge/ti-sn65dsi86.c
··· 23 23 24 24 #include <asm/unaligned.h> 25 25 26 + #include <drm/display/drm_dp_aux_bus.h> 27 + #include <drm/display/drm_dp_helper.h> 26 28 #include <drm/drm_atomic.h> 27 29 #include <drm/drm_atomic_helper.h> 28 30 #include <drm/drm_bridge.h> 29 31 #include <drm/drm_bridge_connector.h> 30 - #include <drm/dp/drm_dp_aux_bus.h> 31 - #include <drm/dp/drm_dp_helper.h> 32 32 #include <drm/drm_mipi_dsi.h> 33 33 #include <drm/drm_of.h> 34 34 #include <drm/drm_panel.h>
drivers/gpu/drm/dp/Makefile drivers/gpu/drm/display/Makefile
+2 -2
drivers/gpu/drm/dp/drm_dp.c drivers/gpu/drm/display/drm_dp.c
··· 30 30 #include <linux/seq_file.h> 31 31 #include <linux/string_helpers.h> 32 32 33 - #include <drm/dp/drm_dp_helper.h> 33 + #include <drm/display/drm_dp_helper.h> 34 + #include <drm/display/drm_dp_mst_helper.h> 34 35 #include <drm/drm_print.h> 35 36 #include <drm/drm_vblank.h> 36 - #include <drm/dp/drm_dp_mst_helper.h> 37 37 #include <drm/drm_panel.h> 38 38 39 39 #include "drm_dp_helper_internal.h"
+2 -2
drivers/gpu/drm/dp/drm_dp_aux_bus.c drivers/gpu/drm/display/drm_dp_aux_bus.c
··· 19 19 #include <linux/pm_domain.h> 20 20 #include <linux/pm_runtime.h> 21 21 22 - #include <drm/dp/drm_dp_aux_bus.h> 23 - #include <drm/dp/drm_dp_helper.h> 22 + #include <drm/display/drm_dp_aux_bus.h> 23 + #include <drm/display/drm_dp_helper.h> 24 24 25 25 /** 26 26 * dp_aux_ep_match() - The match function for the dp_aux_bus.
+2 -2
drivers/gpu/drm/dp/drm_dp_aux_dev.c drivers/gpu/drm/display/drm_dp_aux_dev.c
··· 35 35 #include <linux/uaccess.h> 36 36 #include <linux/uio.h> 37 37 38 + #include <drm/display/drm_dp_helper.h> 39 + #include <drm/display/drm_dp_mst_helper.h> 38 40 #include <drm/drm_crtc.h> 39 - #include <drm/dp/drm_dp_helper.h> 40 - #include <drm/dp/drm_dp_mst_helper.h> 41 41 #include <drm/drm_print.h> 42 42 43 43 #include "drm_dp_helper_internal.h"
+1 -1
drivers/gpu/drm/dp/drm_dp_cec.c drivers/gpu/drm/display/drm_dp_cec.c
··· 11 11 12 12 #include <media/cec.h> 13 13 14 + #include <drm/display/drm_dp_helper.h> 14 15 #include <drm/drm_connector.h> 15 16 #include <drm/drm_device.h> 16 - #include <drm/dp/drm_dp_helper.h> 17 17 18 18 /* 19 19 * Unfortunately it turns out that we have a chicken-and-egg situation
+1 -1
drivers/gpu/drm/dp/drm_dp_dual_mode_helper.c drivers/gpu/drm/display/drm_dp_dual_mode_helper.c
··· 27 27 #include <linux/slab.h> 28 28 #include <linux/string.h> 29 29 30 + #include <drm/display/drm_dp_dual_mode_helper.h> 30 31 #include <drm/drm_device.h> 31 - #include <drm/dp/drm_dp_dual_mode_helper.h> 32 32 #include <drm/drm_print.h> 33 33 34 34 /**
drivers/gpu/drm/dp/drm_dp_helper_internal.h drivers/gpu/drm/display/drm_dp_helper_internal.h
drivers/gpu/drm/dp/drm_dp_helper_mod.c drivers/gpu/drm/display/drm_dp_helper_mod.c
+1 -1
drivers/gpu/drm/dp/drm_dp_mst_topology.c drivers/gpu/drm/display/drm_dp_mst_topology.c
··· 38 38 #include <linux/math64.h> 39 39 #endif 40 40 41 - #include <drm/dp/drm_dp_mst_helper.h> 41 + #include <drm/display/drm_dp_mst_helper.h> 42 42 #include <drm/drm_atomic.h> 43 43 #include <drm/drm_atomic_helper.h> 44 44 #include <drm/drm_drv.h>
+1 -1
drivers/gpu/drm/dp/drm_dp_mst_topology_internal.h drivers/gpu/drm/display/drm_dp_mst_topology_internal.h
··· 10 10 #ifndef _DRM_DP_MST_HELPER_INTERNAL_H_ 11 11 #define _DRM_DP_MST_HELPER_INTERNAL_H_ 12 12 13 - #include <drm/dp/drm_dp_mst_helper.h> 13 + #include <drm/display/drm_dp_mst_helper.h> 14 14 15 15 void 16 16 drm_dp_encode_sideband_req(const struct drm_dp_sideband_msg_req_body *req,
+2 -1
drivers/gpu/drm/drm_dsc.c
··· 11 11 #include <linux/init.h> 12 12 #include <linux/errno.h> 13 13 #include <linux/byteorder/generic.h> 14 + 15 + #include <drm/display/drm_dp_helper.h> 14 16 #include <drm/drm_print.h> 15 - #include <drm/dp/drm_dp_helper.h> 16 17 #include <drm/drm_dsc.h> 17 18 18 19 /**
+1 -1
drivers/gpu/drm/gma500/cdv_intel_dp.c
··· 29 29 #include <linux/module.h> 30 30 #include <linux/slab.h> 31 31 32 + #include <drm/display/drm_dp_helper.h> 32 33 #include <drm/drm_crtc.h> 33 34 #include <drm/drm_crtc_helper.h> 34 - #include <drm/dp/drm_dp_helper.h> 35 35 #include <drm/drm_simple_kms_helper.h> 36 36 37 37 #include "gma_display.h"
+2 -1
drivers/gpu/drm/gma500/intel_bios.c
··· 5 5 * Authors: 6 6 * Eric Anholt <eric@anholt.net> 7 7 */ 8 + 9 + #include <drm/display/drm_dp_helper.h> 8 10 #include <drm/drm.h> 9 - #include <drm/dp/drm_dp_helper.h> 10 11 11 12 #include "intel_bios.h" 12 13 #include "psb_drv.h"
+1 -1
drivers/gpu/drm/i915/display/intel_bios.c
··· 25 25 * 26 26 */ 27 27 28 - #include <drm/dp/drm_dp_helper.h> 28 + #include <drm/display/drm_dp_helper.h> 29 29 30 30 #include "display/intel_display.h" 31 31 #include "display/intel_display_types.h"
+1 -1
drivers/gpu/drm/i915/display/intel_display.c
··· 35 35 #include <linux/string_helpers.h> 36 36 #include <linux/vga_switcheroo.h> 37 37 38 + #include <drm/display/drm_dp_helper.h> 38 39 #include <drm/drm_atomic.h> 39 40 #include <drm/drm_atomic_helper.h> 40 41 #include <drm/drm_atomic_uapi.h> 41 42 #include <drm/drm_damage_helper.h> 42 - #include <drm/dp/drm_dp_helper.h> 43 43 #include <drm/drm_edid.h> 44 44 #include <drm/drm_fourcc.h> 45 45 #include <drm/drm_plane_helper.h>
+2 -2
drivers/gpu/drm/i915/display/intel_display_types.h
··· 31 31 #include <linux/pwm.h> 32 32 #include <linux/sched/clock.h> 33 33 34 - #include <drm/dp/drm_dp_dual_mode_helper.h> 35 - #include <drm/dp/drm_dp_mst_helper.h> 34 + #include <drm/display/drm_dp_dual_mode_helper.h> 35 + #include <drm/display/drm_dp_mst_helper.h> 36 36 #include <drm/drm_atomic.h> 37 37 #include <drm/drm_crtc.h> 38 38 #include <drm/drm_dsc.h>
+1 -1
drivers/gpu/drm/i915/display/intel_dp.c
··· 35 35 36 36 #include <asm/byteorder.h> 37 37 38 + #include <drm/display/drm_dp_helper.h> 38 39 #include <drm/drm_atomic_helper.h> 39 40 #include <drm/drm_crtc.h> 40 - #include <drm/dp/drm_dp_helper.h> 41 41 #include <drm/drm_edid.h> 42 42 #include <drm/drm_probe_helper.h> 43 43
+2 -2
drivers/gpu/drm/i915/display/intel_dp_hdcp.c
··· 6 6 * Sean Paul <seanpaul@chromium.org> 7 7 */ 8 8 9 - #include <drm/dp/drm_dp_helper.h> 10 - #include <drm/dp/drm_dp_mst_helper.h> 9 + #include <drm/display/drm_dp_helper.h> 10 + #include <drm/display/drm_dp_mst_helper.h> 11 11 #include <drm/drm_hdcp.h> 12 12 #include <drm/drm_print.h> 13 13
+1 -1
drivers/gpu/drm/i915/display/intel_lspcon.c
··· 23 23 * 24 24 */ 25 25 26 + #include <drm/display/drm_dp_dual_mode_helper.h> 26 27 #include <drm/drm_atomic_helper.h> 27 - #include <drm/dp/drm_dp_dual_mode_helper.h> 28 28 #include <drm/drm_edid.h> 29 29 30 30 #include "intel_de.h"
+1 -1
drivers/gpu/drm/msm/dp/dp_audio.c
··· 8 8 9 9 #include <linux/of_platform.h> 10 10 11 - #include <drm/dp/drm_dp_helper.h> 11 + #include <drm/display/drm_dp_helper.h> 12 12 #include <drm/drm_edid.h> 13 13 14 14 #include "dp_catalog.h"
+1 -1
drivers/gpu/drm/msm/dp/dp_aux.h
··· 7 7 #define _DP_AUX_H_ 8 8 9 9 #include "dp_catalog.h" 10 - #include <drm/dp/drm_dp_helper.h> 10 + #include <drm/display/drm_dp_helper.h> 11 11 12 12 int dp_aux_register(struct drm_dp_aux *dp_aux); 13 13 void dp_aux_unregister(struct drm_dp_aux *dp_aux);
+1 -1
drivers/gpu/drm/msm/dp/dp_catalog.c
··· 10 10 #include <linux/phy/phy.h> 11 11 #include <linux/phy/phy-dp.h> 12 12 #include <linux/rational.h> 13 - #include <drm/dp/drm_dp_helper.h> 13 + #include <drm/display/drm_dp_helper.h> 14 14 #include <drm/drm_print.h> 15 15 16 16 #include "dp_catalog.h"
+2 -1
drivers/gpu/drm/msm/dp/dp_ctrl.c
··· 11 11 #include <linux/phy/phy.h> 12 12 #include <linux/phy/phy-dp.h> 13 13 #include <linux/pm_opp.h> 14 + 15 + #include <drm/display/drm_dp_helper.h> 14 16 #include <drm/drm_fixed.h> 15 - #include <drm/dp/drm_dp_helper.h> 16 17 #include <drm/drm_print.h> 17 18 18 19 #include "dp_reg.h"
+2 -1
drivers/gpu/drm/msm/edp/edp.h
··· 10 10 #include <linux/interrupt.h> 11 11 #include <linux/kernel.h> 12 12 #include <linux/platform_device.h> 13 - #include <drm/dp/drm_dp_helper.h> 13 + 14 + #include <drm/display/drm_dp_helper.h> 14 15 #include <drm/drm_bridge.h> 15 16 #include <drm/drm_crtc.h> 16 17
+2 -1
drivers/gpu/drm/msm/edp/edp_ctrl.c
··· 6 6 #include <linux/clk.h> 7 7 #include <linux/gpio/consumer.h> 8 8 #include <linux/regulator/consumer.h> 9 - #include <drm/dp/drm_dp_helper.h> 9 + 10 + #include <drm/display/drm_dp_helper.h> 10 11 #include <drm/drm_crtc.h> 11 12 #include <drm/drm_edid.h> 12 13
+1 -1
drivers/gpu/drm/nouveau/dispnv50/disp.c
··· 33 33 #include <linux/component.h> 34 34 #include <linux/iopoll.h> 35 35 36 + #include <drm/display/drm_dp_helper.h> 36 37 #include <drm/drm_atomic.h> 37 38 #include <drm/drm_atomic_helper.h> 38 - #include <drm/dp/drm_dp_helper.h> 39 39 #include <drm/drm_edid.h> 40 40 #include <drm/drm_fb_helper.h> 41 41 #include <drm/drm_plane_helper.h>
+1 -1
drivers/gpu/drm/nouveau/nouveau_connector.h
··· 33 33 #include <nvhw/class/cl907d.h> 34 34 #include <nvhw/drf.h> 35 35 36 + #include <drm/display/drm_dp_helper.h> 36 37 #include <drm/drm_crtc.h> 37 38 #include <drm/drm_edid.h> 38 39 #include <drm/drm_encoder.h> 39 - #include <drm/dp/drm_dp_helper.h> 40 40 #include <drm/drm_util.h> 41 41 42 42 #include "nouveau_crtc.h"
+1 -1
drivers/gpu/drm/nouveau/nouveau_dp.c
··· 22 22 * Authors: Ben Skeggs 23 23 */ 24 24 25 - #include <drm/dp/drm_dp_helper.h> 25 + #include <drm/display/drm_dp_helper.h> 26 26 27 27 #include "nouveau_drv.h" 28 28 #include "nouveau_connector.h"
+4 -2
drivers/gpu/drm/nouveau/nouveau_encoder.h
··· 29 29 30 30 #include <subdev/bios/dcb.h> 31 31 32 + #include <drm/display/drm_dp_helper.h> 33 + #include <drm/display/drm_dp_mst_helper.h> 32 34 #include <drm/drm_encoder_slave.h> 33 - #include <drm/dp/drm_dp_helper.h> 34 - #include <drm/dp/drm_dp_mst_helper.h> 35 + 35 36 #include "dispnv04/disp.h" 37 + 36 38 struct nv50_head_atom; 37 39 struct nouveau_connector; 38 40
+2 -2
drivers/gpu/drm/panel/panel-edp.c
··· 35 35 #include <video/of_display_timing.h> 36 36 #include <video/videomode.h> 37 37 38 + #include <drm/display/drm_dp_aux_bus.h> 39 + #include <drm/display/drm_dp_helper.h> 38 40 #include <drm/drm_crtc.h> 39 41 #include <drm/drm_device.h> 40 - #include <drm/dp/drm_dp_aux_bus.h> 41 - #include <drm/dp/drm_dp_helper.h> 42 42 #include <drm/drm_panel.h> 43 43 44 44 /**
+2 -2
drivers/gpu/drm/panel/panel-samsung-atna33xc20.c
··· 14 14 #include <linux/pm_runtime.h> 15 15 #include <linux/regulator/consumer.h> 16 16 17 - #include <drm/dp/drm_dp_aux_bus.h> 18 - #include <drm/dp/drm_dp_helper.h> 17 + #include <drm/display/drm_dp_aux_bus.h> 18 + #include <drm/display/drm_dp_helper.h> 19 19 #include <drm/drm_edid.h> 20 20 #include <drm/drm_panel.h> 21 21
+1 -1
drivers/gpu/drm/radeon/atombios_dp.c
··· 30 30 31 31 #include "atom.h" 32 32 #include "atom-bits.h" 33 - #include <drm/dp/drm_dp_helper.h> 33 + #include <drm/display/drm_dp_helper.h> 34 34 35 35 /* move these to drm_dp_helper.c/h */ 36 36 #define DP_LINK_CONFIGURATION_SIZE 9
+1 -1
drivers/gpu/drm/radeon/radeon_connectors.c
··· 24 24 * Alex Deucher 25 25 */ 26 26 27 + #include <drm/display/drm_dp_mst_helper.h> 27 28 #include <drm/drm_edid.h> 28 29 #include <drm/drm_crtc_helper.h> 29 30 #include <drm/drm_fb_helper.h> 30 - #include <drm/dp/drm_dp_mst_helper.h> 31 31 #include <drm/drm_probe_helper.h> 32 32 #include <drm/radeon_drm.h> 33 33 #include "radeon.h"
+1 -1
drivers/gpu/drm/radeon/radeon_dp_mst.c
··· 1 1 // SPDX-License-Identifier: MIT 2 2 3 - #include <drm/dp/drm_dp_mst_helper.h> 3 + #include <drm/display/drm_dp_mst_helper.h> 4 4 #include <drm/drm_fb_helper.h> 5 5 #include <drm/drm_file.h> 6 6 #include <drm/drm_probe_helper.h>
+2 -2
drivers/gpu/drm/radeon/radeon_mode.h
··· 30 30 #ifndef RADEON_MODE_H 31 31 #define RADEON_MODE_H 32 32 33 + #include <drm/display/drm_dp_helper.h> 34 + #include <drm/display/drm_dp_mst_helper.h> 33 35 #include <drm/drm_crtc.h> 34 36 #include <drm/drm_edid.h> 35 37 #include <drm/drm_encoder.h> 36 - #include <drm/dp/drm_dp_helper.h> 37 - #include <drm/dp/drm_dp_mst_helper.h> 38 38 #include <drm/drm_fixed.h> 39 39 #include <drm/drm_crtc_helper.h> 40 40 #include <linux/i2c.h>
+1 -1
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
··· 19 19 #include <video/of_videomode.h> 20 20 #include <video/videomode.h> 21 21 22 + #include <drm/display/drm_dp_helper.h> 22 23 #include <drm/drm_atomic.h> 23 24 #include <drm/drm_atomic_helper.h> 24 25 #include <drm/bridge/analogix_dp.h> 25 - #include <drm/dp/drm_dp_helper.h> 26 26 #include <drm/drm_of.h> 27 27 #include <drm/drm_panel.h> 28 28 #include <drm/drm_probe_helper.h>
+1 -1
drivers/gpu/drm/rockchip/cdn-dp-core.c
··· 15 15 16 16 #include <sound/hdmi-codec.h> 17 17 18 + #include <drm/display/drm_dp_helper.h> 18 19 #include <drm/drm_atomic_helper.h> 19 - #include <drm/dp/drm_dp_helper.h> 20 20 #include <drm/drm_edid.h> 21 21 #include <drm/drm_of.h> 22 22 #include <drm/drm_probe_helper.h>
+1 -1
drivers/gpu/drm/rockchip/cdn-dp-core.h
··· 7 7 #ifndef _CDN_DP_CORE_H 8 8 #define _CDN_DP_CORE_H 9 9 10 - #include <drm/dp/drm_dp_helper.h> 10 + #include <drm/display/drm_dp_helper.h> 11 11 #include <drm/drm_panel.h> 12 12 #include <drm/drm_probe_helper.h> 13 13 #include <sound/hdmi-codec.h>
+1 -1
drivers/gpu/drm/rockchip/rockchip_lvds.c
··· 17 17 #include <linux/regmap.h> 18 18 #include <linux/reset.h> 19 19 20 + #include <drm/display/drm_dp_helper.h> 20 21 #include <drm/drm_atomic_helper.h> 21 22 #include <drm/drm_bridge.h> 22 23 #include <drm/drm_bridge_connector.h> 23 - #include <drm/dp/drm_dp_helper.h> 24 24 #include <drm/drm_of.h> 25 25 #include <drm/drm_panel.h> 26 26 #include <drm/drm_probe_helper.h>
+1 -1
drivers/gpu/drm/rockchip/rockchip_rgb.c
··· 8 8 #include <linux/component.h> 9 9 #include <linux/of_graph.h> 10 10 11 + #include <drm/display/drm_dp_helper.h> 11 12 #include <drm/drm_atomic_helper.h> 12 13 #include <drm/drm_bridge.h> 13 14 #include <drm/drm_bridge_connector.h> 14 - #include <drm/dp/drm_dp_helper.h> 15 15 #include <drm/drm_of.h> 16 16 #include <drm/drm_panel.h> 17 17 #include <drm/drm_probe_helper.h>
+2 -2
drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c
··· 7 7 8 8 #include <linux/random.h> 9 9 10 - #include <drm/dp/drm_dp_mst_helper.h> 10 + #include <drm/display/drm_dp_mst_helper.h> 11 11 #include <drm/drm_print.h> 12 12 13 - #include "../dp/drm_dp_mst_topology_internal.h" 13 + #include "../display/drm_dp_mst_topology_internal.h" 14 14 #include "test-drm_modeset_common.h" 15 15 16 16 int igt_dp_mst_calc_pbn_mode(void *ignored)
+1 -1
drivers/gpu/drm/tegra/dp.c
··· 4 4 * Copyright (C) 2015 Rob Clark 5 5 */ 6 6 7 + #include <drm/display/drm_dp_helper.h> 7 8 #include <drm/drm_crtc.h> 8 - #include <drm/dp/drm_dp_helper.h> 9 9 #include <drm/drm_print.h> 10 10 11 11 #include "dp.h"
+2 -2
drivers/gpu/drm/tegra/dpaux.c
··· 18 18 #include <linux/reset.h> 19 19 #include <linux/workqueue.h> 20 20 21 - #include <drm/dp/drm_dp_helper.h> 22 - #include <drm/dp/drm_dp_aux_bus.h> 21 + #include <drm/display/drm_dp_helper.h> 22 + #include <drm/display/drm_dp_aux_bus.h> 23 23 #include <drm/drm_panel.h> 24 24 25 25 #include "dp.h"
+1 -1
drivers/gpu/drm/tegra/sor.c
··· 16 16 17 17 #include <soc/tegra/pmc.h> 18 18 19 + #include <drm/display/drm_dp_helper.h> 19 20 #include <drm/drm_atomic_helper.h> 20 21 #include <drm/drm_debugfs.h> 21 - #include <drm/dp/drm_dp_helper.h> 22 22 #include <drm/drm_file.h> 23 23 #include <drm/drm_panel.h> 24 24 #include <drm/drm_scdc_helper.h>
+1 -1
drivers/gpu/drm/xlnx/zynqmp_dp.c
··· 9 9 * - Laurent Pinchart <laurent.pinchart@ideasonboard.com> 10 10 */ 11 11 12 + #include <drm/display/drm_dp_helper.h> 12 13 #include <drm/drm_atomic_helper.h> 13 14 #include <drm/drm_connector.h> 14 15 #include <drm/drm_crtc.h> 15 16 #include <drm/drm_device.h> 16 - #include <drm/dp/drm_dp_helper.h> 17 17 #include <drm/drm_edid.h> 18 18 #include <drm/drm_encoder.h> 19 19 #include <drm/drm_managed.h>
include/drm/dp/drm_dp_aux_bus.h include/drm/display/drm_dp_aux_bus.h
include/drm/dp/drm_dp_dual_mode_helper.h include/drm/display/drm_dp_dual_mode_helper.h
include/drm/dp/drm_dp_helper.h include/drm/display/drm_dp_helper.h
+1 -1
include/drm/dp/drm_dp_mst_helper.h include/drm/display/drm_dp_mst_helper.h
··· 23 23 #define _DRM_DP_MST_HELPER_H_ 24 24 25 25 #include <linux/types.h> 26 - #include <drm/dp/drm_dp_helper.h> 26 + #include <drm/display/drm_dp_helper.h> 27 27 #include <drm/drm_atomic.h> 28 28 29 29 #if IS_ENABLED(CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS)
+1 -1
include/drm/drm_dsc.h
··· 8 8 #ifndef DRM_DSC_H_ 9 9 #define DRM_DSC_H_ 10 10 11 - #include <drm/dp/drm_dp_helper.h> 11 + #include <drm/display/drm_dp_helper.h> 12 12 13 13 /* VESA Display Stream Compression DSC 1.2 constants */ 14 14 #define DSC_NUM_BUF_RANGES 15