* [Nouveau] [PATCH 1/3] drm/dp_mst: Remove trailing whitespace.
2021-12-13 9:36 [Nouveau] [PATCH 0/3] drm/dp: Move DisplayPort helpers into own module Thomas Zimmermann
@ 2021-12-13 9:36 ` Thomas Zimmermann
2021-12-13 9:36 ` [Nouveau] [PATCH 2/3] drm/dp: Move DP declarations into separate header file Thomas Zimmermann
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Thomas Zimmermann @ 2021-12-13 9:36 UTC (permalink / raw)
To: mripard, maarten.lankhorst, airlied, daniel
Cc: linux-arm-msm, intel-gfx, dri-devel, linux-rockchip, nouveau,
linux-tegra, freedreno, linux-arm-kernel
Fix coding style.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/gpu/drm/drm_dp_mst_topology.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index f3d79eda94bb..7f0ff96261cf 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -4811,7 +4811,7 @@ static void drm_dp_mst_dump_mstb(struct seq_file *m,
seq_printf(m, "%smstb - [%p]: num_ports: %d\n", prefix, mstb, mstb->num_ports);
list_for_each_entry(port, &mstb->ports, next) {
- seq_printf(m, "%sport %d - [%p] (%s - %s): ddps: %d, ldps: %d, sdp: %d/%d, fec: %s, conn: %p\n",
+ seq_printf(m, "%sport %d - [%p] (%s - %s): ddps: %d, ldps: %d, sdp: %d/%d, fec: %s, conn: %p\n",
prefix,
port->port_num,
port,
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Nouveau] [PATCH 2/3] drm/dp: Move DP declarations into separate header file
2021-12-13 9:36 [Nouveau] [PATCH 0/3] drm/dp: Move DisplayPort helpers into own module Thomas Zimmermann
2021-12-13 9:36 ` [Nouveau] [PATCH 1/3] drm/dp_mst: Remove trailing whitespace Thomas Zimmermann
@ 2021-12-13 9:36 ` Thomas Zimmermann
2021-12-13 9:59 ` [Nouveau] [Intel-gfx] " Jani Nikula
2021-12-13 9:36 ` [Nouveau] [PATCH 3/3] drm/dp: Move DisplayPort helpers into separate helper module Thomas Zimmermann
2021-12-13 13:34 ` [Nouveau] [PATCH 0/3] drm/dp: Move DisplayPort helpers into own module Jani Nikula
3 siblings, 1 reply; 8+ messages in thread
From: Thomas Zimmermann @ 2021-12-13 9:36 UTC (permalink / raw)
To: mripard, maarten.lankhorst, airlied, daniel
Cc: linux-arm-msm, intel-gfx, dri-devel, linux-rockchip, nouveau,
linux-tegra, freedreno, linux-arm-kernel
Split the DP declarations from other helpers before moving the
DP functions into a separate module.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/gpu/drm/drm_crtc_helper_internal.h | 27 ---------------------
drivers/gpu/drm/drm_dp_aux_dev.c | 2 +-
drivers/gpu/drm/drm_dp_helper.c | 2 +-
drivers/gpu/drm/drm_dp_helper_internal.h | 28 ++++++++++++++++++++++
drivers/gpu/drm/drm_dp_mst_topology.c | 2 +-
drivers/gpu/drm/drm_kms_helper_common.c | 1 +
6 files changed, 32 insertions(+), 30 deletions(-)
create mode 100644 drivers/gpu/drm/drm_dp_helper_internal.h
diff --git a/drivers/gpu/drm/drm_crtc_helper_internal.h b/drivers/gpu/drm/drm_crtc_helper_internal.h
index 61e09f8a8d0f..28e04e750130 100644
--- a/drivers/gpu/drm/drm_crtc_helper_internal.h
+++ b/drivers/gpu/drm/drm_crtc_helper_internal.h
@@ -28,36 +28,9 @@
#include <drm/drm_connector.h>
#include <drm/drm_crtc.h>
-#include <drm/drm_dp_helper.h>
#include <drm/drm_encoder.h>
#include <drm/drm_modes.h>
-/* drm_dp_aux_dev.c */
-#ifdef CONFIG_DRM_DP_AUX_CHARDEV
-int drm_dp_aux_dev_init(void);
-void drm_dp_aux_dev_exit(void);
-int drm_dp_aux_register_devnode(struct drm_dp_aux *aux);
-void drm_dp_aux_unregister_devnode(struct drm_dp_aux *aux);
-#else
-static inline int drm_dp_aux_dev_init(void)
-{
- return 0;
-}
-
-static inline void drm_dp_aux_dev_exit(void)
-{
-}
-
-static inline int drm_dp_aux_register_devnode(struct drm_dp_aux *aux)
-{
- return 0;
-}
-
-static inline void drm_dp_aux_unregister_devnode(struct drm_dp_aux *aux)
-{
-}
-#endif
-
/* drm_probe_helper.c */
enum drm_mode_status drm_crtc_mode_valid(struct drm_crtc *crtc,
const struct drm_display_mode *mode);
diff --git a/drivers/gpu/drm/drm_dp_aux_dev.c b/drivers/gpu/drm/drm_dp_aux_dev.c
index 06b374cae956..0618dfe16660 100644
--- a/drivers/gpu/drm/drm_dp_aux_dev.c
+++ b/drivers/gpu/drm/drm_dp_aux_dev.c
@@ -40,7 +40,7 @@
#include <drm/drm_dp_mst_helper.h>
#include <drm/drm_print.h>
-#include "drm_crtc_helper_internal.h"
+#include "drm_dp_helper_internal.h"
struct drm_dp_aux_dev {
unsigned index;
diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c
index 23f9073bc473..e995a0262ed7 100644
--- a/drivers/gpu/drm/drm_dp_helper.c
+++ b/drivers/gpu/drm/drm_dp_helper.c
@@ -35,7 +35,7 @@
#include <drm/drm_dp_mst_helper.h>
#include <drm/drm_panel.h>
-#include "drm_crtc_helper_internal.h"
+#include "drm_dp_helper_internal.h"
struct dp_aux_backlight {
struct backlight_device *base;
diff --git a/drivers/gpu/drm/drm_dp_helper_internal.h b/drivers/gpu/drm/drm_dp_helper_internal.h
new file mode 100644
index 000000000000..5c9f8bb0c99a
--- /dev/null
+++ b/drivers/gpu/drm/drm_dp_helper_internal.h
@@ -0,0 +1,28 @@
+/* SPDX-License-Identifier: MIT */
+
+#include <drm/drm_dp_helper.h>
+
+#ifdef CONFIG_DRM_DP_AUX_CHARDEV
+int drm_dp_aux_dev_init(void);
+void drm_dp_aux_dev_exit(void);
+int drm_dp_aux_register_devnode(struct drm_dp_aux *aux);
+void drm_dp_aux_unregister_devnode(struct drm_dp_aux *aux);
+#else
+static inline int drm_dp_aux_dev_init(void)
+{
+ return 0;
+}
+
+static inline void drm_dp_aux_dev_exit(void)
+{
+}
+
+static inline int drm_dp_aux_register_devnode(struct drm_dp_aux *aux)
+{
+ return 0;
+}
+
+static inline void drm_dp_aux_unregister_devnode(struct drm_dp_aux *aux)
+{
+}
+#endif
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index 7f0ff96261cf..9f7b0b606924 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -45,7 +45,7 @@
#include <drm/drm_print.h>
#include <drm/drm_probe_helper.h>
-#include "drm_crtc_helper_internal.h"
+#include "drm_dp_helper_internal.h"
#include "drm_dp_mst_topology_internal.h"
/**
diff --git a/drivers/gpu/drm/drm_kms_helper_common.c b/drivers/gpu/drm/drm_kms_helper_common.c
index 47e92400548d..88260d26409c 100644
--- a/drivers/gpu/drm/drm_kms_helper_common.c
+++ b/drivers/gpu/drm/drm_kms_helper_common.c
@@ -29,6 +29,7 @@
#include <drm/drm_print.h>
+#include "drm_dp_helper_internal.h"
#include "drm_crtc_helper_internal.h"
MODULE_AUTHOR("David Airlie, Jesse Barnes");
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [Nouveau] [Intel-gfx] [PATCH 2/3] drm/dp: Move DP declarations into separate header file
2021-12-13 9:36 ` [Nouveau] [PATCH 2/3] drm/dp: Move DP declarations into separate header file Thomas Zimmermann
@ 2021-12-13 9:59 ` Jani Nikula
0 siblings, 0 replies; 8+ messages in thread
From: Jani Nikula @ 2021-12-13 9:59 UTC (permalink / raw)
To: Thomas Zimmermann, mripard, maarten.lankhorst, airlied, daniel
Cc: nouveau, intel-gfx, dri-devel, linux-rockchip, linux-arm-msm,
linux-tegra, freedreno, linux-arm-kernel
On Mon, 13 Dec 2021, Thomas Zimmermann <tzimmermann@suse.de> wrote:
> Split the DP declarations from other helpers before moving the
> DP functions into a separate module.
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
> drivers/gpu/drm/drm_crtc_helper_internal.h | 27 ---------------------
> drivers/gpu/drm/drm_dp_aux_dev.c | 2 +-
> drivers/gpu/drm/drm_dp_helper.c | 2 +-
> drivers/gpu/drm/drm_dp_helper_internal.h | 28 ++++++++++++++++++++++
> drivers/gpu/drm/drm_dp_mst_topology.c | 2 +-
> drivers/gpu/drm/drm_kms_helper_common.c | 1 +
> 6 files changed, 32 insertions(+), 30 deletions(-)
> create mode 100644 drivers/gpu/drm/drm_dp_helper_internal.h
>
> diff --git a/drivers/gpu/drm/drm_crtc_helper_internal.h b/drivers/gpu/drm/drm_crtc_helper_internal.h
> index 61e09f8a8d0f..28e04e750130 100644
> --- a/drivers/gpu/drm/drm_crtc_helper_internal.h
> +++ b/drivers/gpu/drm/drm_crtc_helper_internal.h
> @@ -28,36 +28,9 @@
>
> #include <drm/drm_connector.h>
> #include <drm/drm_crtc.h>
> -#include <drm/drm_dp_helper.h>
> #include <drm/drm_encoder.h>
> #include <drm/drm_modes.h>
>
> -/* drm_dp_aux_dev.c */
> -#ifdef CONFIG_DRM_DP_AUX_CHARDEV
> -int drm_dp_aux_dev_init(void);
> -void drm_dp_aux_dev_exit(void);
> -int drm_dp_aux_register_devnode(struct drm_dp_aux *aux);
> -void drm_dp_aux_unregister_devnode(struct drm_dp_aux *aux);
> -#else
> -static inline int drm_dp_aux_dev_init(void)
> -{
> - return 0;
> -}
> -
> -static inline void drm_dp_aux_dev_exit(void)
> -{
> -}
> -
> -static inline int drm_dp_aux_register_devnode(struct drm_dp_aux *aux)
> -{
> - return 0;
> -}
> -
> -static inline void drm_dp_aux_unregister_devnode(struct drm_dp_aux *aux)
> -{
> -}
> -#endif
> -
> /* drm_probe_helper.c */
> enum drm_mode_status drm_crtc_mode_valid(struct drm_crtc *crtc,
> const struct drm_display_mode *mode);
> diff --git a/drivers/gpu/drm/drm_dp_aux_dev.c b/drivers/gpu/drm/drm_dp_aux_dev.c
> index 06b374cae956..0618dfe16660 100644
> --- a/drivers/gpu/drm/drm_dp_aux_dev.c
> +++ b/drivers/gpu/drm/drm_dp_aux_dev.c
> @@ -40,7 +40,7 @@
> #include <drm/drm_dp_mst_helper.h>
> #include <drm/drm_print.h>
>
> -#include "drm_crtc_helper_internal.h"
> +#include "drm_dp_helper_internal.h"
>
> struct drm_dp_aux_dev {
> unsigned index;
> diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c
> index 23f9073bc473..e995a0262ed7 100644
> --- a/drivers/gpu/drm/drm_dp_helper.c
> +++ b/drivers/gpu/drm/drm_dp_helper.c
> @@ -35,7 +35,7 @@
> #include <drm/drm_dp_mst_helper.h>
> #include <drm/drm_panel.h>
>
> -#include "drm_crtc_helper_internal.h"
> +#include "drm_dp_helper_internal.h"
>
> struct dp_aux_backlight {
> struct backlight_device *base;
> diff --git a/drivers/gpu/drm/drm_dp_helper_internal.h b/drivers/gpu/drm/drm_dp_helper_internal.h
> new file mode 100644
> index 000000000000..5c9f8bb0c99a
> --- /dev/null
> +++ b/drivers/gpu/drm/drm_dp_helper_internal.h
> @@ -0,0 +1,28 @@
> +/* SPDX-License-Identifier: MIT */
> +
> +#include <drm/drm_dp_helper.h>
Please don't include other headers if you can avoid them by using
forward declarations.
BR,
Jani.
> +
> +#ifdef CONFIG_DRM_DP_AUX_CHARDEV
> +int drm_dp_aux_dev_init(void);
> +void drm_dp_aux_dev_exit(void);
> +int drm_dp_aux_register_devnode(struct drm_dp_aux *aux);
> +void drm_dp_aux_unregister_devnode(struct drm_dp_aux *aux);
> +#else
> +static inline int drm_dp_aux_dev_init(void)
> +{
> + return 0;
> +}
> +
> +static inline void drm_dp_aux_dev_exit(void)
> +{
> +}
> +
> +static inline int drm_dp_aux_register_devnode(struct drm_dp_aux *aux)
> +{
> + return 0;
> +}
> +
> +static inline void drm_dp_aux_unregister_devnode(struct drm_dp_aux *aux)
> +{
> +}
> +#endif
> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
> index 7f0ff96261cf..9f7b0b606924 100644
> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
> @@ -45,7 +45,7 @@
> #include <drm/drm_print.h>
> #include <drm/drm_probe_helper.h>
>
> -#include "drm_crtc_helper_internal.h"
> +#include "drm_dp_helper_internal.h"
> #include "drm_dp_mst_topology_internal.h"
>
> /**
> diff --git a/drivers/gpu/drm/drm_kms_helper_common.c b/drivers/gpu/drm/drm_kms_helper_common.c
> index 47e92400548d..88260d26409c 100644
> --- a/drivers/gpu/drm/drm_kms_helper_common.c
> +++ b/drivers/gpu/drm/drm_kms_helper_common.c
> @@ -29,6 +29,7 @@
>
> #include <drm/drm_print.h>
>
> +#include "drm_dp_helper_internal.h"
> #include "drm_crtc_helper_internal.h"
>
> MODULE_AUTHOR("David Airlie, Jesse Barnes");
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Nouveau] [PATCH 3/3] drm/dp: Move DisplayPort helpers into separate helper module
2021-12-13 9:36 [Nouveau] [PATCH 0/3] drm/dp: Move DisplayPort helpers into own module Thomas Zimmermann
2021-12-13 9:36 ` [Nouveau] [PATCH 1/3] drm/dp_mst: Remove trailing whitespace Thomas Zimmermann
2021-12-13 9:36 ` [Nouveau] [PATCH 2/3] drm/dp: Move DP declarations into separate header file Thomas Zimmermann
@ 2021-12-13 9:36 ` Thomas Zimmermann
2021-12-13 13:34 ` [Nouveau] [PATCH 0/3] drm/dp: Move DisplayPort helpers into own module Jani Nikula
3 siblings, 0 replies; 8+ messages in thread
From: Thomas Zimmermann @ 2021-12-13 9:36 UTC (permalink / raw)
To: mripard, maarten.lankhorst, airlied, daniel
Cc: linux-arm-msm, intel-gfx, dri-devel, linux-rockchip, nouveau,
linux-tegra, freedreno, linux-arm-kernel
Move DisplayPort functions into a separate module to reduce the size
of the KMS helpers. Select DRM_DP_HELPER for all users of the code. To
avoid naming conflicts, rename drm_dp_helper.c to drm_dp.c
This change can help to reduce the size of the kernel binary. Some
numbers from a x86-64 test build:
Before:
drm_kms_helper.ko: 447480 bytes
After:
drm_dp_helper.ko: 216632 bytes
drm_kms_helper.ko: 239424 bytes
For early-boot graphics, generic DRM drivers, such as simpledrm,
require DRM KMS helpers to be built into the kernel. Generic helper
functions for DisplayPort take up a significant portion of DRM KMS
helper library. These functions are not used by generic drivers and
can be loaded as a module.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/gpu/drm/Kconfig | 8 +++++++
drivers/gpu/drm/Makefile | 14 +++++++-----
drivers/gpu/drm/bridge/Kconfig | 4 ++++
drivers/gpu/drm/bridge/analogix/Kconfig | 2 ++
drivers/gpu/drm/bridge/cadence/Kconfig | 1 +
drivers/gpu/drm/{drm_dp_helper.c => drm_dp.c} | 0
drivers/gpu/drm/drm_dp_helper_mod.c | 22 +++++++++++++++++++
drivers/gpu/drm/drm_kms_helper_common.c | 15 -------------
drivers/gpu/drm/i915/Kconfig | 1 +
drivers/gpu/drm/msm/Kconfig | 1 +
drivers/gpu/drm/nouveau/Kconfig | 1 +
drivers/gpu/drm/rockchip/Kconfig | 1 +
drivers/gpu/drm/tegra/Kconfig | 1 +
drivers/gpu/drm/xlnx/Kconfig | 1 +
14 files changed, 51 insertions(+), 21 deletions(-)
rename drivers/gpu/drm/{drm_dp_helper.c => drm_dp.c} (100%)
create mode 100644 drivers/gpu/drm/drm_dp_helper_mod.c
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index b1f22e457fd0..91f54aeb0b7c 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -80,6 +80,12 @@ config DRM_DEBUG_SELFTEST
If in doubt, say "N".
+config DRM_DP_HELPER
+ tristate
+ depends on DRM
+ help
+ DRM helpers for DisplayPort.
+
config DRM_KMS_HELPER
tristate
depends on DRM
@@ -236,6 +242,7 @@ config DRM_RADEON
depends on DRM && PCI && MMU
depends on AGP || !AGP
select FW_LOADER
+ select DRM_DP_HELPER
select DRM_KMS_HELPER
select DRM_TTM
select DRM_TTM_HELPER
@@ -256,6 +263,7 @@ config DRM_AMDGPU
tristate "AMD GPU"
depends on DRM && PCI && MMU
select FW_LOADER
+ select DRM_DP_HELPER
select DRM_KMS_HELPER
select DRM_SCHED
select DRM_TTM
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 301a44dc18e3..d17319c835b3 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -48,23 +48,25 @@ obj-$(CONFIG_DRM_VRAM_HELPER) += drm_vram_helper.o
drm_ttm_helper-y := drm_gem_ttm_helper.o
obj-$(CONFIG_DRM_TTM_HELPER) += drm_ttm_helper.o
-drm_kms_helper-y := drm_bridge_connector.o drm_crtc_helper.o drm_dp_helper.o \
+drm_kms_helper-y := drm_bridge_connector.o drm_crtc_helper.o \
drm_dsc.o drm_encoder_slave.o drm_flip_work.o drm_hdcp.o \
drm_probe_helper.o \
- drm_plane_helper.o drm_dp_mst_topology.o drm_atomic_helper.o \
- drm_kms_helper_common.o drm_dp_dual_mode_helper.o \
+ drm_plane_helper.o drm_atomic_helper.o \
+ drm_kms_helper_common.o \
drm_simple_kms_helper.o drm_modeset_helper.o \
drm_scdc_helper.o drm_gem_atomic_helper.o \
drm_gem_framebuffer_helper.o \
drm_atomic_state_helper.o drm_damage_helper.o \
drm_format_helper.o drm_self_refresh_helper.o drm_rect.o
-
drm_kms_helper-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o
drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o
-drm_kms_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o
-drm_kms_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o
+
+drm_dp_helper-y := drm_dp.o drm_dp_dual_mode_helper.o drm_dp_helper_mod.o drm_dp_mst_topology.o
+drm_dp_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o
+drm_dp_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o
obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
+obj-$(CONFIG_DRM_DP_HELPER) += drm_dp_helper.o
obj-$(CONFIG_DRM_DEBUG_SELFTEST) += selftests/
obj-$(CONFIG_DRM) += drm.o
diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig
index 61db5a66b493..a27435a4c9c4 100644
--- a/drivers/gpu/drm/bridge/Kconfig
+++ b/drivers/gpu/drm/bridge/Kconfig
@@ -183,6 +183,7 @@ config DRM_PARADE_PS8640
tristate "Parade PS8640 MIPI DSI to eDP Converter"
depends on OF
select DRM_DP_AUX_BUS
+ select DRM_DP_HELPER
select DRM_KMS_HELPER
select DRM_MIPI_DSI
select DRM_PANEL
@@ -253,6 +254,7 @@ config DRM_TOSHIBA_TC358764
config DRM_TOSHIBA_TC358767
tristate "Toshiba TC358767 eDP bridge"
depends on OF
+ select DRM_DP_HELPER
select DRM_KMS_HELPER
select REGMAP_I2C
select DRM_PANEL
@@ -272,6 +274,7 @@ config DRM_TOSHIBA_TC358768
config DRM_TOSHIBA_TC358775
tristate "Toshiba TC358775 DSI/LVDS bridge"
depends on OF
+ select DRM_DP_HELPER
select DRM_KMS_HELPER
select REGMAP_I2C
select DRM_PANEL
@@ -299,6 +302,7 @@ config DRM_TI_SN65DSI83
config DRM_TI_SN65DSI86
tristate "TI SN65DSI86 DSI to eDP bridge"
depends on OF
+ select DRM_DP_HELPER
select DRM_KMS_HELPER
select REGMAP_I2C
select DRM_PANEL
diff --git a/drivers/gpu/drm/bridge/analogix/Kconfig b/drivers/gpu/drm/bridge/analogix/Kconfig
index 2ef6eb2b786c..319ba0df57be 100644
--- a/drivers/gpu/drm/bridge/analogix/Kconfig
+++ b/drivers/gpu/drm/bridge/analogix/Kconfig
@@ -3,6 +3,7 @@ config DRM_ANALOGIX_ANX6345
tristate "Analogix ANX6345 bridge"
depends on OF
select DRM_ANALOGIX_DP
+ select DRM_DP_HELPER
select DRM_KMS_HELPER
select REGMAP_I2C
help
@@ -14,6 +15,7 @@ config DRM_ANALOGIX_ANX6345
config DRM_ANALOGIX_ANX78XX
tristate "Analogix ANX78XX bridge"
select DRM_ANALOGIX_DP
+ select DRM_DP_HELPER
select DRM_KMS_HELPER
select REGMAP_I2C
help
diff --git a/drivers/gpu/drm/bridge/cadence/Kconfig b/drivers/gpu/drm/bridge/cadence/Kconfig
index ef8c230e0f62..de697bade05e 100644
--- a/drivers/gpu/drm/bridge/cadence/Kconfig
+++ b/drivers/gpu/drm/bridge/cadence/Kconfig
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
config DRM_CDNS_MHDP8546
tristate "Cadence DPI/DP bridge"
+ select DRM_DP_HELPER
select DRM_KMS_HELPER
select DRM_PANEL_BRIDGE
depends on OF
diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp.c
similarity index 100%
rename from drivers/gpu/drm/drm_dp_helper.c
rename to drivers/gpu/drm/drm_dp.c
diff --git a/drivers/gpu/drm/drm_dp_helper_mod.c b/drivers/gpu/drm/drm_dp_helper_mod.c
new file mode 100644
index 000000000000..db753de24000
--- /dev/null
+++ b/drivers/gpu/drm/drm_dp_helper_mod.c
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: MIT
+
+#include <linux/module.h>
+
+#include "drm_dp_helper_internal.h"
+
+MODULE_DESCRIPTION("DRM DisplayPort helper");
+MODULE_LICENSE("GPL and additional rights");
+
+static int __init drm_dp_helper_module_init(void)
+{
+ return drm_dp_aux_dev_init();
+}
+
+static void __exit drm_dp_helper_module_exit(void)
+{
+ /* Call exit functions from specific dp helpers here */
+ drm_dp_aux_dev_exit();
+}
+
+module_init(drm_dp_helper_module_init);
+module_exit(drm_dp_helper_module_exit);
diff --git a/drivers/gpu/drm/drm_kms_helper_common.c b/drivers/gpu/drm/drm_kms_helper_common.c
index 88260d26409c..8be20080cd8d 100644
--- a/drivers/gpu/drm/drm_kms_helper_common.c
+++ b/drivers/gpu/drm/drm_kms_helper_common.c
@@ -29,7 +29,6 @@
#include <drm/drm_print.h>
-#include "drm_dp_helper_internal.h"
#include "drm_crtc_helper_internal.h"
MODULE_AUTHOR("David Airlie, Jesse Barnes");
@@ -62,17 +61,3 @@ MODULE_PARM_DESC(edid_firmware,
"DEPRECATED. Use drm.edid_firmware module parameter instead.");
#endif
-
-static int __init drm_kms_helper_init(void)
-{
- return drm_dp_aux_dev_init();
-}
-
-static void __exit drm_kms_helper_exit(void)
-{
- /* Call exit functions from specific kms helpers here */
- drm_dp_aux_dev_exit();
-}
-
-module_init(drm_kms_helper_init);
-module_exit(drm_kms_helper_exit);
diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
index a4c94dc2e216..b68e8b551b83 100644
--- a/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@ -9,6 +9,7 @@ config DRM_I915
# the shmem_readpage() which depends upon tmpfs
select SHMEM
select TMPFS
+ select DRM_DP_HELPER
select DRM_KMS_HELPER
select DRM_PANEL
select DRM_MIPI_DSI
diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig
index 39197b4beea7..75015b0e165e 100644
--- a/drivers/gpu/drm/msm/Kconfig
+++ b/drivers/gpu/drm/msm/Kconfig
@@ -12,6 +12,7 @@ config DRM_MSM
select IOMMU_IO_PGTABLE
select QCOM_MDT_LOADER if ARCH_QCOM
select REGULATOR
+ select DRM_DP_HELPER
select DRM_KMS_HELPER
select DRM_PANEL
select DRM_BRIDGE
diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index 9436310d0854..3ec690b6f0b4 100644
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -4,6 +4,7 @@ config DRM_NOUVEAU
depends on DRM && PCI && MMU
select IOMMU_API
select FW_LOADER
+ select DRM_DP_HELPER
select DRM_KMS_HELPER
select DRM_TTM
select DRM_TTM_HELPER
diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
index 9f1ecefc3933..d59dca5efb52 100644
--- a/drivers/gpu/drm/rockchip/Kconfig
+++ b/drivers/gpu/drm/rockchip/Kconfig
@@ -2,6 +2,7 @@
config DRM_ROCKCHIP
tristate "DRM Support for Rockchip"
depends on DRM && ROCKCHIP_IOMMU
+ select DRM_DP_HELPER
select DRM_GEM_CMA_HELPER
select DRM_KMS_HELPER
select DRM_PANEL
diff --git a/drivers/gpu/drm/tegra/Kconfig b/drivers/gpu/drm/tegra/Kconfig
index 1650a448eabd..dc88adc7ba40 100644
--- a/drivers/gpu/drm/tegra/Kconfig
+++ b/drivers/gpu/drm/tegra/Kconfig
@@ -5,6 +5,7 @@ config DRM_TEGRA
depends on COMMON_CLK
depends on DRM
depends on OF
+ select DRM_DP_HELPER
select DRM_KMS_HELPER
select DRM_MIPI_DSI
select DRM_PANEL
diff --git a/drivers/gpu/drm/xlnx/Kconfig b/drivers/gpu/drm/xlnx/Kconfig
index d8d38d86d5c6..06cf477dbcdd 100644
--- a/drivers/gpu/drm/xlnx/Kconfig
+++ b/drivers/gpu/drm/xlnx/Kconfig
@@ -6,6 +6,7 @@ config DRM_ZYNQMP_DPSUB
depends on PHY_XILINX_ZYNQMP
depends on XILINX_ZYNQMP_DPDMA
select DMA_ENGINE
+ select DRM_DP_HELPER
select DRM_GEM_CMA_HELPER
select DRM_KMS_HELPER
select GENERIC_PHY
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [Nouveau] [PATCH 0/3] drm/dp: Move DisplayPort helpers into own module
2021-12-13 9:36 [Nouveau] [PATCH 0/3] drm/dp: Move DisplayPort helpers into own module Thomas Zimmermann
` (2 preceding siblings ...)
2021-12-13 9:36 ` [Nouveau] [PATCH 3/3] drm/dp: Move DisplayPort helpers into separate helper module Thomas Zimmermann
@ 2021-12-13 13:34 ` Jani Nikula
2021-12-13 13:51 ` Thomas Zimmermann
3 siblings, 1 reply; 8+ messages in thread
From: Jani Nikula @ 2021-12-13 13:34 UTC (permalink / raw)
To: Thomas Zimmermann, mripard, maarten.lankhorst, airlied, daniel
Cc: nouveau, intel-gfx, dri-devel, linux-rockchip, linux-arm-msm,
linux-tegra, freedreno, linux-arm-kernel
On Mon, 13 Dec 2021, Thomas Zimmermann <tzimmermann@suse.de> wrote:
> Split-off DisplayPort functions from KMS helper library and move them
> into their own module. Reduces the size of drm_kms_helper.ko by ~50%.
>
> This patchset is part of an on-going effort to reduce the minimum
> binary size of the DRM core and helpers. It's helpful for systems with
> early-boot DRM graphics, which requires DRM to be linked into the
> kernel image.
Would it be time to add a subdirectory for each non-driver, non-core drm
module? We've touched this topic before. I find it increasingly hard to
remember which files are part of helpers. This would also help with the
arbitrary drm_dp_helper_mod.c naming.
Perhaps drivers/gpu/drm/drm_dp/?
BR,
Jani.
>
> Thomas Zimmermann (3):
> drm/dp_mst: Remove trailing whitespace.
> drm/dp: Move DP declarations into separate header file
> drm/dp: Move DisplayPort helpers into separate helper module
>
> drivers/gpu/drm/Kconfig | 8 ++++++
> drivers/gpu/drm/Makefile | 14 ++++++----
> drivers/gpu/drm/bridge/Kconfig | 4 +++
> drivers/gpu/drm/bridge/analogix/Kconfig | 2 ++
> drivers/gpu/drm/bridge/cadence/Kconfig | 1 +
> drivers/gpu/drm/drm_crtc_helper_internal.h | 27 ------------------
> drivers/gpu/drm/{drm_dp_helper.c => drm_dp.c} | 2 +-
> drivers/gpu/drm/drm_dp_aux_dev.c | 2 +-
> drivers/gpu/drm/drm_dp_helper_internal.h | 28 +++++++++++++++++++
> drivers/gpu/drm/drm_dp_helper_mod.c | 22 +++++++++++++++
> drivers/gpu/drm/drm_dp_mst_topology.c | 4 +--
> drivers/gpu/drm/drm_kms_helper_common.c | 14 ----------
> drivers/gpu/drm/i915/Kconfig | 1 +
> drivers/gpu/drm/msm/Kconfig | 1 +
> drivers/gpu/drm/nouveau/Kconfig | 1 +
> drivers/gpu/drm/rockchip/Kconfig | 1 +
> drivers/gpu/drm/tegra/Kconfig | 1 +
> drivers/gpu/drm/xlnx/Kconfig | 1 +
> 18 files changed, 83 insertions(+), 51 deletions(-)
> rename drivers/gpu/drm/{drm_dp_helper.c => drm_dp.c} (99%)
> create mode 100644 drivers/gpu/drm/drm_dp_helper_internal.h
> create mode 100644 drivers/gpu/drm/drm_dp_helper_mod.c
>
>
> base-commit: 3f422828221d9ceefcddef0be33561b1646a1cbe
> prerequisite-patch-id: c2b2f08f0eccc9f5df0c0da49fa1d36267deb11d
> prerequisite-patch-id: c67e5d886a47b7d0266d81100837557fda34cb24
> --
> 2.34.1
>
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [Nouveau] [PATCH 0/3] drm/dp: Move DisplayPort helpers into own module
2021-12-13 13:34 ` [Nouveau] [PATCH 0/3] drm/dp: Move DisplayPort helpers into own module Jani Nikula
@ 2021-12-13 13:51 ` Thomas Zimmermann
2021-12-15 10:24 ` Jani Nikula
0 siblings, 1 reply; 8+ messages in thread
From: Thomas Zimmermann @ 2021-12-13 13:51 UTC (permalink / raw)
To: Jani Nikula, mripard, maarten.lankhorst, airlied, daniel
Cc: linux-arm-msm, intel-gfx, dri-devel, linux-rockchip, nouveau,
linux-tegra, freedreno, linux-arm-kernel
[-- Attachment #1.1: Type: text/plain, Size: 3116 bytes --]
Hi
Am 13.12.21 um 14:34 schrieb Jani Nikula:
> On Mon, 13 Dec 2021, Thomas Zimmermann <tzimmermann@suse.de> wrote:
>> Split-off DisplayPort functions from KMS helper library and move them
>> into their own module. Reduces the size of drm_kms_helper.ko by ~50%.
>>
>> This patchset is part of an on-going effort to reduce the minimum
>> binary size of the DRM core and helpers. It's helpful for systems with
>> early-boot DRM graphics, which requires DRM to be linked into the
>> kernel image.
>
> Would it be time to add a subdirectory for each non-driver, non-core drm
> module? We've touched this topic before. I find it increasingly hard to
> remember which files are part of helpers. This would also help with the
> arbitrary drm_dp_helper_mod.c naming.
>
> Perhaps drivers/gpu/drm/drm_dp/?
It's probably worth it, but I'd prefer a separate patchset and
discussion over this. It affects several modules.
If adding drm_dp_helper_mod.c is overkill, that module code can also be
added to drm_dp.c for now.
Best regards
Thomas
>
> BR,
> Jani.
>
>
>
>>
>> Thomas Zimmermann (3):
>> drm/dp_mst: Remove trailing whitespace.
>> drm/dp: Move DP declarations into separate header file
>> drm/dp: Move DisplayPort helpers into separate helper module
>>
>> drivers/gpu/drm/Kconfig | 8 ++++++
>> drivers/gpu/drm/Makefile | 14 ++++++----
>> drivers/gpu/drm/bridge/Kconfig | 4 +++
>> drivers/gpu/drm/bridge/analogix/Kconfig | 2 ++
>> drivers/gpu/drm/bridge/cadence/Kconfig | 1 +
>> drivers/gpu/drm/drm_crtc_helper_internal.h | 27 ------------------
>> drivers/gpu/drm/{drm_dp_helper.c => drm_dp.c} | 2 +-
>> drivers/gpu/drm/drm_dp_aux_dev.c | 2 +-
>> drivers/gpu/drm/drm_dp_helper_internal.h | 28 +++++++++++++++++++
>> drivers/gpu/drm/drm_dp_helper_mod.c | 22 +++++++++++++++
>> drivers/gpu/drm/drm_dp_mst_topology.c | 4 +--
>> drivers/gpu/drm/drm_kms_helper_common.c | 14 ----------
>> drivers/gpu/drm/i915/Kconfig | 1 +
>> drivers/gpu/drm/msm/Kconfig | 1 +
>> drivers/gpu/drm/nouveau/Kconfig | 1 +
>> drivers/gpu/drm/rockchip/Kconfig | 1 +
>> drivers/gpu/drm/tegra/Kconfig | 1 +
>> drivers/gpu/drm/xlnx/Kconfig | 1 +
>> 18 files changed, 83 insertions(+), 51 deletions(-)
>> rename drivers/gpu/drm/{drm_dp_helper.c => drm_dp.c} (99%)
>> create mode 100644 drivers/gpu/drm/drm_dp_helper_internal.h
>> create mode 100644 drivers/gpu/drm/drm_dp_helper_mod.c
>>
>>
>> base-commit: 3f422828221d9ceefcddef0be33561b1646a1cbe
>> prerequisite-patch-id: c2b2f08f0eccc9f5df0c0da49fa1d36267deb11d
>> prerequisite-patch-id: c67e5d886a47b7d0266d81100837557fda34cb24
>> --
>> 2.34.1
>>
>
--
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [Nouveau] [PATCH 0/3] drm/dp: Move DisplayPort helpers into own module
2021-12-13 13:51 ` Thomas Zimmermann
@ 2021-12-15 10:24 ` Jani Nikula
0 siblings, 0 replies; 8+ messages in thread
From: Jani Nikula @ 2021-12-15 10:24 UTC (permalink / raw)
To: Thomas Zimmermann, mripard, maarten.lankhorst, airlied, daniel
Cc: linux-arm-msm, intel-gfx, dri-devel, linux-rockchip, nouveau,
linux-tegra, freedreno, linux-arm-kernel
On Mon, 13 Dec 2021, Thomas Zimmermann <tzimmermann@suse.de> wrote:
> Hi
>
> Am 13.12.21 um 14:34 schrieb Jani Nikula:
>> On Mon, 13 Dec 2021, Thomas Zimmermann <tzimmermann@suse.de> wrote:
>>> Split-off DisplayPort functions from KMS helper library and move them
>>> into their own module. Reduces the size of drm_kms_helper.ko by ~50%.
>>>
>>> This patchset is part of an on-going effort to reduce the minimum
>>> binary size of the DRM core and helpers. It's helpful for systems with
>>> early-boot DRM graphics, which requires DRM to be linked into the
>>> kernel image.
>>
>> Would it be time to add a subdirectory for each non-driver, non-core drm
>> module? We've touched this topic before. I find it increasingly hard to
>> remember which files are part of helpers. This would also help with the
>> arbitrary drm_dp_helper_mod.c naming.
>>
>> Perhaps drivers/gpu/drm/drm_dp/?
>
> It's probably worth it, but I'd prefer a separate patchset and
> discussion over this. It affects several modules.
I guess the only thing here that we need to get right from the start is
the new module name, everything else is relatively easy to change
later. drm_dp_helper.ko seems fine by me.
Note that this will also affect the drm_kms_helper.ko module parameters
dp_aux_i2c_speed_khz, dp_aux_i2c_transfer_size and
drm_dp_cec_unregister_delay, which will move to drm_dp_helper.ko.
See the monstrosity near the top of drm_kms_helper_common.c I had to add
for backward compatibility when I moved drm_edid_load.c from
drm_kms_helper.ko to drm.ko. That was perhaps different, as these seem
more like debug knobs, but at a minimum this needs to be mentioned in
the commit message, and certainly needs acks from Dave and/or Daniel.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 8+ messages in thread