Commit da68386d authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

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: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220421073108.19226-3-tzimmermann@suse.de
parent c6eafc99

Documentation/gpu/drm-kms-helpers.rst

+13 −13
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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