[Intel-gfx] [RFC] drm: split build lists one per line and sort

Jani Nikula jani.nikula at intel.com
Tue Oct 11 11:30:27 UTC 2022


On Tue, 11 Oct 2022, Andi Shyti <andi.shyti at linux.intel.com> wrote:
> Hi Jani,
>
>> While it takes more vertical space, sorted build lists with one object
>> per line are arguably easier to manage, especially when there are
>> conflicting changes.
>> 
>> Split anything with more than one object file.
>
> looks much better! Just an error below.
>
>> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
>> ---
>>  drivers/gpu/drm/Makefile         | 106 ++++++++++++++++++++++---------
>>  drivers/gpu/drm/display/Makefile |  14 ++--
>>  2 files changed, 84 insertions(+), 36 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
>> index 25d0ba310509..c4e6ef321566 100644
>> --- a/drivers/gpu/drm/Makefile
>> +++ b/drivers/gpu/drm/Makefile
>> @@ -3,32 +3,70 @@
>>  # Makefile for the drm device driver.  This driver provides support for the
>>  # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
>>  
>> -drm-y       :=	drm_aperture.o drm_auth.o drm_cache.o \
>> -		drm_file.o drm_gem.o drm_ioctl.o \
>> -		drm_drv.o \
>> -		drm_sysfs.o drm_mm.o \
>> -		drm_crtc.o drm_fourcc.o drm_modes.o drm_edid.o drm_displayid.o \
>> -		drm_trace_points.o drm_prime.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_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
>> +drm-y := \
>> +	drm_aperture.o \
>> +	drm_atomic.o \
>> +	drm_atomic_uapi.o \
>> +	drm_auth.o drm_cache.o \
>
> You forgot to split here and drm_cache.o goes after drm_bridge.o
>
> Other than this there are no errors, I checked them all.

Good catch! I double checked before sending and missed this anyway.

> Reviewed-by: Andi Shyti <andi.shyti at linux.intel.com>

Thanks!

>
> Andi
>
>> +	drm_blend.o \
>> +	drm_bridge.o \
>> +	drm_client.o \
>> +	drm_client_modeset.o \
>> +	drm_color_mgmt.o \
>> +	drm_connector.o \
>> +	drm_crtc.o \
>
> [...]

-- 
Jani Nikula, Intel Open Source Graphics Center


More information about the dri-devel mailing list