Re: [PATCH 1/8] drm: Put related statements next to each other in Makefile

[Jani Nikula <jani.nikula@linux.intel.com>]

On Tue, 22 Mar 2022, Thomas Zimmermann <tzimmermann@suse.de> wrote:
> Give the Makefile a bit more structure by putting rules for core,
> helpers, drivers, etc next to each other.

If you're up for it, I think it would be time to split these one per
line, in alphabetical order, to make the diffs nicer:

drm-y := \
	drm_aperture.o \
	drm_auth.o \
	...

Sure it takes up a lot of vertical screen estate, but IMO makes life
easier in the long run.

Definitely can be a follow-up, I don't really want to make the series
harder to land than it already is.


BR,
Jani.


>
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
>  drivers/gpu/drm/Makefile | 23 +++++++++++++++++------
>  1 file changed, 17 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
> index c2ef5f9fce54..e5929437e13c 100644
> --- a/drivers/gpu/drm/Makefile
> +++ b/drivers/gpu/drm/Makefile
> @@ -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/

-- 
Jani Nikula, Intel Open Source Graphics Center