| Message ID | 20231024130448.576297-1-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] drm/i915: fix Makefile sort and indent | expand |
On 10/24/2023 3:04 PM, Jani Nikula wrote: > Unify the line continuations and indents, and sort the build lists. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > > --- > > Note: This is easiest to review by applying and looking at 'git show -w' Thanks for the hint :) Reviewed-by: Nirmoy Das <nirmoy.das@intel.com> > --- > drivers/gpu/drm/i915/Makefile | 169 ++++++++++++++++++---------------- > 1 file changed, 89 insertions(+), 80 deletions(-) > > diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile > index 88b2bb005014..bc785dd89c19 100644 > --- a/drivers/gpu/drm/i915/Makefile > +++ b/drivers/gpu/drm/i915/Makefile > @@ -47,33 +47,34 @@ subdir-ccflags-y += -I$(srctree)/$(src) > # Please keep these build lists sorted! > > # core driver code > -i915-y += i915_driver.o \ > - i915_drm_client.o \ > - i915_config.o \ > - i915_getparam.o \ > - i915_ioctl.o \ > - i915_irq.o \ > - i915_mitigations.o \ > - i915_module.o \ > - i915_params.o \ > - i915_pci.o \ > - i915_scatterlist.o \ > - i915_suspend.o \ > - i915_switcheroo.o \ > - i915_sysfs.o \ > - i915_utils.o \ > - intel_clock_gating.o \ > - intel_device_info.o \ > - intel_memory_region.o \ > - intel_pcode.o \ > - intel_region_ttm.o \ > - intel_runtime_pm.o \ > - intel_sbi.o \ > - intel_step.o \ > - intel_uncore.o \ > - intel_wakeref.o \ > - vlv_sideband.o \ > - vlv_suspend.o > +i915-y += \ > + i915_config.o \ > + i915_driver.o \ > + i915_drm_client.o \ > + i915_getparam.o \ > + i915_ioctl.o \ > + i915_irq.o \ > + i915_mitigations.o \ > + i915_module.o \ > + i915_params.o \ > + i915_pci.o \ > + i915_scatterlist.o \ > + i915_suspend.o \ > + i915_switcheroo.o \ > + i915_sysfs.o \ > + i915_utils.o \ > + intel_clock_gating.o \ > + intel_device_info.o \ > + intel_memory_region.o \ > + intel_pcode.o \ > + intel_region_ttm.o \ > + intel_runtime_pm.o \ > + intel_sbi.o \ > + intel_step.o \ > + intel_uncore.o \ > + intel_wakeref.o \ > + vlv_sideband.o \ > + vlv_suspend.o > > # core peripheral code > i915-y += \ > @@ -90,13 +91,15 @@ i915-y += \ > i915_syncmap.o \ > i915_user_extensions.o > > -i915-$(CONFIG_COMPAT) += i915_ioc32.o > +i915-$(CONFIG_COMPAT) += \ > + i915_ioc32.o > i915-$(CONFIG_DEBUG_FS) += \ > i915_debugfs.o \ > i915_debugfs_params.o \ > display/intel_display_debugfs.o \ > display/intel_pipe_crc.o > -i915-$(CONFIG_PERF_EVENTS) += i915_pmu.o > +i915-$(CONFIG_PERF_EVENTS) += \ > + i915_pmu.o > > # "Graphics Technology" (aka we talk to the gpu) > gt-y += \ > @@ -153,7 +156,8 @@ gt-y += \ > gt/sysfs_engines.o > > # x86 intel-gtt module support > -gt-$(CONFIG_X86) += gt/intel_ggtt_gmch.o > +gt-$(CONFIG_X86) += \ > + gt/intel_ggtt_gmch.o > # autogenerated null render state > gt-y += \ > gt/gen6_renderstate.o \ > @@ -172,9 +176,9 @@ gem-y += \ > gem/i915_gem_domain.o \ > gem/i915_gem_execbuffer.o \ > gem/i915_gem_internal.o \ > - gem/i915_gem_object.o \ > gem/i915_gem_lmem.o \ > gem/i915_gem_mman.o \ > + gem/i915_gem_object.o \ > gem/i915_gem_pages.o \ > gem/i915_gem_phys.o \ > gem/i915_gem_pm.o \ > @@ -191,57 +195,61 @@ gem-y += \ > gem/i915_gem_wait.o \ > gem/i915_gemfs.o > i915-y += \ > - $(gem-y) \ > - i915_active.o \ > - i915_cmd_parser.o \ > - i915_deps.o \ > - i915_gem_evict.o \ > - i915_gem_gtt.o \ > - i915_gem_ww.o \ > - i915_gem.o \ > - i915_query.o \ > - i915_request.o \ > - i915_scheduler.o \ > - i915_trace_points.o \ > - i915_ttm_buddy_manager.o \ > - i915_vma.o \ > - i915_vma_resource.o > + $(gem-y) \ > + i915_active.o \ > + i915_cmd_parser.o \ > + i915_deps.o \ > + i915_gem.o \ > + i915_gem_evict.o \ > + i915_gem_gtt.o \ > + i915_gem_ww.o \ > + i915_query.o \ > + i915_request.o \ > + i915_scheduler.o \ > + i915_trace_points.o \ > + i915_ttm_buddy_manager.o \ > + i915_vma.o \ > + i915_vma_resource.o > > # general-purpose microcontroller (GuC) support > i915-y += \ > - gt/uc/intel_gsc_fw.o \ > - gt/uc/intel_gsc_proxy.o \ > - gt/uc/intel_gsc_uc.o \ > - gt/uc/intel_gsc_uc_debugfs.o \ > - gt/uc/intel_gsc_uc_heci_cmd_submit.o \ > - gt/uc/intel_guc.o \ > - gt/uc/intel_guc_ads.o \ > - gt/uc/intel_guc_capture.o \ > - gt/uc/intel_guc_ct.o \ > - gt/uc/intel_guc_debugfs.o \ > - gt/uc/intel_guc_fw.o \ > - gt/uc/intel_guc_hwconfig.o \ > - gt/uc/intel_guc_log.o \ > - gt/uc/intel_guc_log_debugfs.o \ > - gt/uc/intel_guc_rc.o \ > - gt/uc/intel_guc_slpc.o \ > - gt/uc/intel_guc_submission.o \ > - gt/uc/intel_huc.o \ > - gt/uc/intel_huc_debugfs.o \ > - gt/uc/intel_huc_fw.o \ > - gt/uc/intel_uc.o \ > - gt/uc/intel_uc_debugfs.o \ > - gt/uc/intel_uc_fw.o > + gt/uc/intel_gsc_fw.o \ > + gt/uc/intel_gsc_proxy.o \ > + gt/uc/intel_gsc_uc.o \ > + gt/uc/intel_gsc_uc_debugfs.o \ > + gt/uc/intel_gsc_uc_heci_cmd_submit.o\ > + gt/uc/intel_guc.o \ > + gt/uc/intel_guc_ads.o \ > + gt/uc/intel_guc_capture.o \ > + gt/uc/intel_guc_ct.o \ > + gt/uc/intel_guc_debugfs.o \ > + gt/uc/intel_guc_fw.o \ > + gt/uc/intel_guc_hwconfig.o \ > + gt/uc/intel_guc_log.o \ > + gt/uc/intel_guc_log_debugfs.o \ > + gt/uc/intel_guc_rc.o \ > + gt/uc/intel_guc_slpc.o \ > + gt/uc/intel_guc_submission.o \ > + gt/uc/intel_huc.o \ > + gt/uc/intel_huc_debugfs.o \ > + gt/uc/intel_huc_fw.o \ > + gt/uc/intel_uc.o \ > + gt/uc/intel_uc_debugfs.o \ > + gt/uc/intel_uc_fw.o > > # graphics system controller (GSC) support > -i915-y += gt/intel_gsc.o > +i915-y += \ > + gt/intel_gsc.o > > # graphics hardware monitoring (HWMON) support > -i915-$(CONFIG_HWMON) += i915_hwmon.o > +i915-$(CONFIG_HWMON) += \ > + i915_hwmon.o > > # modesetting core code > i915-y += \ > display/hsw_ips.o \ > + display/i9xx_plane.o \ > + display/i9xx_wm.o \ > display/intel_atomic.o \ > display/intel_atomic_plane.o \ > display/intel_audio.o \ > @@ -287,8 +295,8 @@ i915-y += \ > display/intel_load_detect.o \ > display/intel_lpe_audio.o \ > display/intel_modeset_lock.o \ > - display/intel_modeset_verify.o \ > display/intel_modeset_setup.o \ > + display/intel_modeset_verify.o \ > display/intel_overlay.o \ > display/intel_pch_display.o \ > display/intel_pch_refclk.o \ > @@ -302,8 +310,6 @@ i915-y += \ > display/intel_vblank.o \ > display/intel_vga.o \ > display/intel_wm.o \ > - display/i9xx_plane.o \ > - display/i9xx_wm.o \ > display/skl_scaler.o \ > display/skl_universal_plane.o \ > display/skl_watermark.o > @@ -357,13 +363,14 @@ i915-y += \ > display/vlv_dsi.o \ > display/vlv_dsi_pll.o > > -i915-y += i915_perf.o > +i915-y += \ > + i915_perf.o > > # Protected execution platform (PXP) support. Base support is required for HuC > i915-y += \ > pxp/intel_pxp.o \ > - pxp/intel_pxp_tee.o \ > - pxp/intel_pxp_huc.o > + pxp/intel_pxp_huc.o \ > + pxp/intel_pxp_tee.o > > i915-$(CONFIG_DRM_I915_PXP) += \ > pxp/intel_pxp_cmd.o \ > @@ -374,11 +381,11 @@ i915-$(CONFIG_DRM_I915_PXP) += \ > pxp/intel_pxp_session.o > > # Post-mortem debug and GPU hang state capture > -i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o > +i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += \ > + i915_gpu_error.o > i915-$(CONFIG_DRM_I915_SELFTEST) += \ > gem/selftests/i915_gem_client_blt.o \ > gem/selftests/igt_gem_utils.o \ > - selftests/intel_scheduler_helpers.o \ > selftests/i915_random.o \ > selftests/i915_selftest.o \ > selftests/igt_atomic.o \ > @@ -387,10 +394,12 @@ i915-$(CONFIG_DRM_I915_SELFTEST) += \ > selftests/igt_mmap.o \ > selftests/igt_reset.o \ > selftests/igt_spinner.o \ > + selftests/intel_scheduler_helpers.o \ > selftests/librapl.o > > # virtual gpu code > -i915-y += i915_vgpu.o > +i915-y += \ > + i915_vgpu.o > > i915-$(CONFIG_DRM_I915_GVT) += \ > intel_gvt.o \
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index 88b2bb005014..bc785dd89c19 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -47,33 +47,34 @@ subdir-ccflags-y += -I$(srctree)/$(src) # Please keep these build lists sorted! # core driver code -i915-y += i915_driver.o \ - i915_drm_client.o \ - i915_config.o \ - i915_getparam.o \ - i915_ioctl.o \ - i915_irq.o \ - i915_mitigations.o \ - i915_module.o \ - i915_params.o \ - i915_pci.o \ - i915_scatterlist.o \ - i915_suspend.o \ - i915_switcheroo.o \ - i915_sysfs.o \ - i915_utils.o \ - intel_clock_gating.o \ - intel_device_info.o \ - intel_memory_region.o \ - intel_pcode.o \ - intel_region_ttm.o \ - intel_runtime_pm.o \ - intel_sbi.o \ - intel_step.o \ - intel_uncore.o \ - intel_wakeref.o \ - vlv_sideband.o \ - vlv_suspend.o +i915-y += \ + i915_config.o \ + i915_driver.o \ + i915_drm_client.o \ + i915_getparam.o \ + i915_ioctl.o \ + i915_irq.o \ + i915_mitigations.o \ + i915_module.o \ + i915_params.o \ + i915_pci.o \ + i915_scatterlist.o \ + i915_suspend.o \ + i915_switcheroo.o \ + i915_sysfs.o \ + i915_utils.o \ + intel_clock_gating.o \ + intel_device_info.o \ + intel_memory_region.o \ + intel_pcode.o \ + intel_region_ttm.o \ + intel_runtime_pm.o \ + intel_sbi.o \ + intel_step.o \ + intel_uncore.o \ + intel_wakeref.o \ + vlv_sideband.o \ + vlv_suspend.o # core peripheral code i915-y += \ @@ -90,13 +91,15 @@ i915-y += \ i915_syncmap.o \ i915_user_extensions.o -i915-$(CONFIG_COMPAT) += i915_ioc32.o +i915-$(CONFIG_COMPAT) += \ + i915_ioc32.o i915-$(CONFIG_DEBUG_FS) += \ i915_debugfs.o \ i915_debugfs_params.o \ display/intel_display_debugfs.o \ display/intel_pipe_crc.o -i915-$(CONFIG_PERF_EVENTS) += i915_pmu.o +i915-$(CONFIG_PERF_EVENTS) += \ + i915_pmu.o # "Graphics Technology" (aka we talk to the gpu) gt-y += \ @@ -153,7 +156,8 @@ gt-y += \ gt/sysfs_engines.o # x86 intel-gtt module support -gt-$(CONFIG_X86) += gt/intel_ggtt_gmch.o +gt-$(CONFIG_X86) += \ + gt/intel_ggtt_gmch.o # autogenerated null render state gt-y += \ gt/gen6_renderstate.o \ @@ -172,9 +176,9 @@ gem-y += \ gem/i915_gem_domain.o \ gem/i915_gem_execbuffer.o \ gem/i915_gem_internal.o \ - gem/i915_gem_object.o \ gem/i915_gem_lmem.o \ gem/i915_gem_mman.o \ + gem/i915_gem_object.o \ gem/i915_gem_pages.o \ gem/i915_gem_phys.o \ gem/i915_gem_pm.o \ @@ -191,57 +195,61 @@ gem-y += \ gem/i915_gem_wait.o \ gem/i915_gemfs.o i915-y += \ - $(gem-y) \ - i915_active.o \ - i915_cmd_parser.o \ - i915_deps.o \ - i915_gem_evict.o \ - i915_gem_gtt.o \ - i915_gem_ww.o \ - i915_gem.o \ - i915_query.o \ - i915_request.o \ - i915_scheduler.o \ - i915_trace_points.o \ - i915_ttm_buddy_manager.o \ - i915_vma.o \ - i915_vma_resource.o + $(gem-y) \ + i915_active.o \ + i915_cmd_parser.o \ + i915_deps.o \ + i915_gem.o \ + i915_gem_evict.o \ + i915_gem_gtt.o \ + i915_gem_ww.o \ + i915_query.o \ + i915_request.o \ + i915_scheduler.o \ + i915_trace_points.o \ + i915_ttm_buddy_manager.o \ + i915_vma.o \ + i915_vma_resource.o # general-purpose microcontroller (GuC) support i915-y += \ - gt/uc/intel_gsc_fw.o \ - gt/uc/intel_gsc_proxy.o \ - gt/uc/intel_gsc_uc.o \ - gt/uc/intel_gsc_uc_debugfs.o \ - gt/uc/intel_gsc_uc_heci_cmd_submit.o \ - gt/uc/intel_guc.o \ - gt/uc/intel_guc_ads.o \ - gt/uc/intel_guc_capture.o \ - gt/uc/intel_guc_ct.o \ - gt/uc/intel_guc_debugfs.o \ - gt/uc/intel_guc_fw.o \ - gt/uc/intel_guc_hwconfig.o \ - gt/uc/intel_guc_log.o \ - gt/uc/intel_guc_log_debugfs.o \ - gt/uc/intel_guc_rc.o \ - gt/uc/intel_guc_slpc.o \ - gt/uc/intel_guc_submission.o \ - gt/uc/intel_huc.o \ - gt/uc/intel_huc_debugfs.o \ - gt/uc/intel_huc_fw.o \ - gt/uc/intel_uc.o \ - gt/uc/intel_uc_debugfs.o \ - gt/uc/intel_uc_fw.o + gt/uc/intel_gsc_fw.o \ + gt/uc/intel_gsc_proxy.o \ + gt/uc/intel_gsc_uc.o \ + gt/uc/intel_gsc_uc_debugfs.o \ + gt/uc/intel_gsc_uc_heci_cmd_submit.o\ + gt/uc/intel_guc.o \ + gt/uc/intel_guc_ads.o \ + gt/uc/intel_guc_capture.o \ + gt/uc/intel_guc_ct.o \ + gt/uc/intel_guc_debugfs.o \ + gt/uc/intel_guc_fw.o \ + gt/uc/intel_guc_hwconfig.o \ + gt/uc/intel_guc_log.o \ + gt/uc/intel_guc_log_debugfs.o \ + gt/uc/intel_guc_rc.o \ + gt/uc/intel_guc_slpc.o \ + gt/uc/intel_guc_submission.o \ + gt/uc/intel_huc.o \ + gt/uc/intel_huc_debugfs.o \ + gt/uc/intel_huc_fw.o \ + gt/uc/intel_uc.o \ + gt/uc/intel_uc_debugfs.o \ + gt/uc/intel_uc_fw.o # graphics system controller (GSC) support -i915-y += gt/intel_gsc.o +i915-y += \ + gt/intel_gsc.o # graphics hardware monitoring (HWMON) support -i915-$(CONFIG_HWMON) += i915_hwmon.o +i915-$(CONFIG_HWMON) += \ + i915_hwmon.o # modesetting core code i915-y += \ display/hsw_ips.o \ + display/i9xx_plane.o \ + display/i9xx_wm.o \ display/intel_atomic.o \ display/intel_atomic_plane.o \ display/intel_audio.o \ @@ -287,8 +295,8 @@ i915-y += \ display/intel_load_detect.o \ display/intel_lpe_audio.o \ display/intel_modeset_lock.o \ - display/intel_modeset_verify.o \ display/intel_modeset_setup.o \ + display/intel_modeset_verify.o \ display/intel_overlay.o \ display/intel_pch_display.o \ display/intel_pch_refclk.o \ @@ -302,8 +310,6 @@ i915-y += \ display/intel_vblank.o \ display/intel_vga.o \ display/intel_wm.o \ - display/i9xx_plane.o \ - display/i9xx_wm.o \ display/skl_scaler.o \ display/skl_universal_plane.o \ display/skl_watermark.o @@ -357,13 +363,14 @@ i915-y += \ display/vlv_dsi.o \ display/vlv_dsi_pll.o -i915-y += i915_perf.o +i915-y += \ + i915_perf.o # Protected execution platform (PXP) support. Base support is required for HuC i915-y += \ pxp/intel_pxp.o \ - pxp/intel_pxp_tee.o \ - pxp/intel_pxp_huc.o + pxp/intel_pxp_huc.o \ + pxp/intel_pxp_tee.o i915-$(CONFIG_DRM_I915_PXP) += \ pxp/intel_pxp_cmd.o \ @@ -374,11 +381,11 @@ i915-$(CONFIG_DRM_I915_PXP) += \ pxp/intel_pxp_session.o # Post-mortem debug and GPU hang state capture -i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o +i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += \ + i915_gpu_error.o i915-$(CONFIG_DRM_I915_SELFTEST) += \ gem/selftests/i915_gem_client_blt.o \ gem/selftests/igt_gem_utils.o \ - selftests/intel_scheduler_helpers.o \ selftests/i915_random.o \ selftests/i915_selftest.o \ selftests/igt_atomic.o \ @@ -387,10 +394,12 @@ i915-$(CONFIG_DRM_I915_SELFTEST) += \ selftests/igt_mmap.o \ selftests/igt_reset.o \ selftests/igt_spinner.o \ + selftests/intel_scheduler_helpers.o \ selftests/librapl.o # virtual gpu code -i915-y += i915_vgpu.o +i915-y += \ + i915_vgpu.o i915-$(CONFIG_DRM_I915_GVT) += \ intel_gvt.o \
Unify the line continuations and indents, and sort the build lists. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- Note: This is easiest to review by applying and looking at 'git show -w' --- drivers/gpu/drm/i915/Makefile | 169 ++++++++++++++++++---------------- 1 file changed, 89 insertions(+), 80 deletions(-)