drm: Link several object files into drm_kms_helper.ko

Several core DRM functions are not used by the DRM core. Link the
object files into the KMS helper library.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20211020131941.15367-3-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 6f07609fa453347d49a7045c7ed1e22c09638a6b..0f8dae0a21c51a1c332d60eaeb120a6768c02252 100644 (file)
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -8,16 +8,15 @@ drm-y       :=        drm_aperture.o drm_auth.o drm_cache.o \
                drm_drv.o \
                drm_sysfs.o drm_hashtab.o drm_mm.o \
                drm_crtc.o drm_fourcc.o drm_modes.o drm_edid.o drm_displayid.o \
-               drm_encoder_slave.o \
                drm_trace_points.o drm_prime.o \
-               drm_rect.o drm_vma_manager.o drm_flip_work.o \
+               drm_vma_manager.o \
                drm_modeset_lock.o drm_atomic.o drm_bridge.o \
                drm_framebuffer.o drm_connector.o drm_blend.o \
                drm_encoder.o drm_mode_object.o drm_property.o \
                drm_plane.o drm_color_mgmt.o drm_print.o \
                drm_dumb_buffers.o drm_mode_config.o drm_vblank.o \
                drm_syncobj.o drm_lease.o drm_writeback.o drm_client.o \
-               drm_client_modeset.o drm_atomic_uapi.o drm_hdcp.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 \
@@ -43,14 +42,15 @@ 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_dsc.o drm_probe_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_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_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