* [PATCH] drm/i915: Go OCD on the Makefile
@ 2014-03-07 8:55 Daniel Vetter
2014-03-07 9:55 ` Chris Wilson
2014-03-07 11:12 ` Jani Nikula
0 siblings, 2 replies; 3+ messages in thread
From: Daniel Vetter @ 2014-03-07 8:55 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
Chris suggested to split things up a bit into the different parts of
the driver and also sort it all correctly, with the hope that we're
trying to organize things a bit better eventually. It should also
help newcomers to orient themselves a bit better.
v2:
- Move intel_pm.c to the core - to make things perfect we should split
out the modeset related pm features (psr/fbc) into a separate file.
Maybe something Rodrigo can do once the PSR patches have settled.
- Split the modesetting sections into core and encoders/outputs.
intel_ddi.c is a bit funky since it has core hsw+ support and ddi
output support. Whatever.
v3: Failed to git add ...
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/Makefile | 84 ++++++++++++++++++++++++-------------------
1 file changed, 47 insertions(+), 37 deletions(-)
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 3569122b1995..2573aea7625e 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -3,60 +3,70 @@
# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
ccflags-y := -Iinclude/drm
-i915-y := i915_drv.o i915_dma.o i915_irq.o \
- i915_gpu_error.o \
+
+# Please keep these built lists sorted!
+
+# core driver code
+i915-y := i915_drv.o \
+ i915_params.o \
i915_suspend.o \
- i915_gem.o \
+ i915_sysfs.o \
+ intel_pm.o
+i915-$(CONFIG_COMPAT) += i915_ioc32.o
+i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o
+
+# GEM code
+i915-y += i915_cmd_parser.o \
i915_gem_context.o \
i915_gem_debug.o \
+ i915_gem_dmabuf.o \
i915_gem_evict.o \
i915_gem_execbuffer.o \
i915_gem_gtt.o \
+ i915_gem.o \
i915_gem_stolen.o \
i915_gem_tiling.o \
- i915_cmd_parser.o \
- i915_params.o \
- i915_sysfs.o \
+ i915_gpu_error.o \
+ i915_irq.o \
i915_trace_points.o \
- i915_ums.o \
+ intel_ringbuffer.o \
+ intel_uncore.o
+
+# modesetting core code
+i915-y += intel_bios.o \
intel_display.o \
- intel_crt.o \
- intel_lvds.o \
- intel_dsi.o \
- intel_dsi_cmd.o \
- intel_dsi_pll.o \
- intel_bios.o \
- intel_ddi.o \
- intel_dp.o \
- intel_hdmi.o \
- intel_sdvo.o \
intel_modes.o \
- intel_panel.o \
- intel_pm.o \
- intel_i2c.o \
- intel_tv.o \
- intel_dvo.o \
- intel_ringbuffer.o \
- intel_overlay.o \
- intel_sprite.o \
intel_opregion.o \
+ intel_overlay.o \
intel_sideband.o \
- intel_uncore.o \
+ intel_sprite.o
+i915-$(CONFIG_ACPI) += intel_acpi.o
+i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o
+
+# modesetting output/encoder code
+i915-y += dvo_ch7017.o \
dvo_ch7xxx.o \
- dvo_ch7017.o \
dvo_ivch.o \
- dvo_tfp410.o \
- dvo_sil164.o \
dvo_ns2501.o \
- i915_gem_dmabuf.o
-
-i915-$(CONFIG_COMPAT) += i915_ioc32.o
-
-i915-$(CONFIG_ACPI) += intel_acpi.o
-
-i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o
+ dvo_sil164.o \
+ dvo_tfp410.o \
+ intel_crt.o \
+ intel_ddi.o \
+ intel_dp.o \
+ intel_dsi_cmd.o \
+ intel_dsi.o \
+ intel_dsi_pll.o \
+ intel_dvo.o \
+ intel_hdmi.o \
+ intel_i2c.o \
+ intel_lvds.o \
+ intel_panel.o \
+ intel_sdvo.o \
+ intel_tv.o
-i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o
+# legacy horrors
+i915-y += i915_dma.o \
+ i915_ums.o
obj-$(CONFIG_DRM_I915) += i915.o
--
1.8.5.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] drm/i915: Go OCD on the Makefile
2014-03-07 8:55 [PATCH] drm/i915: Go OCD on the Makefile Daniel Vetter
@ 2014-03-07 9:55 ` Chris Wilson
2014-03-07 11:12 ` Jani Nikula
1 sibling, 0 replies; 3+ messages in thread
From: Chris Wilson @ 2014-03-07 9:55 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Intel Graphics Development
On Fri, Mar 07, 2014 at 09:55:09AM +0100, Daniel Vetter wrote:
> Chris suggested to split things up a bit into the different parts of
> the driver and also sort it all correctly, with the hope that we're
> trying to organize things a bit better eventually. It should also
> help newcomers to orient themselves a bit better.
>
> v2:
> - Move intel_pm.c to the core - to make things perfect we should split
> out the modeset related pm features (psr/fbc) into a separate file.
> Maybe something Rodrigo can do once the PSR patches have settled.
>
> - Split the modesetting sections into core and encoders/outputs.
> intel_ddi.c is a bit funky since it has core hsw+ support and ddi
> output support. Whatever.
>
> v3: Failed to git add ...
>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Hear, hear!
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: Go OCD on the Makefile
2014-03-07 8:55 [PATCH] drm/i915: Go OCD on the Makefile Daniel Vetter
2014-03-07 9:55 ` Chris Wilson
@ 2014-03-07 11:12 ` Jani Nikula
1 sibling, 0 replies; 3+ messages in thread
From: Jani Nikula @ 2014-03-07 11:12 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
On Fri, 07 Mar 2014, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Chris suggested to split things up a bit into the different parts of
> the driver and also sort it all correctly, with the hope that we're
> trying to organize things a bit better eventually. It should also
> help newcomers to orient themselves a bit better.
>
> v2:
> - Move intel_pm.c to the core - to make things perfect we should split
> out the modeset related pm features (psr/fbc) into a separate file.
> Maybe something Rodrigo can do once the PSR patches have settled.
>
> - Split the modesetting sections into core and encoders/outputs.
> intel_ddi.c is a bit funky since it has core hsw+ support and ddi
> output support. Whatever.
>
> v3: Failed to git add ...
>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/i915/Makefile | 84 ++++++++++++++++++++++++-------------------
> 1 file changed, 47 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
> index 3569122b1995..2573aea7625e 100644
> --- a/drivers/gpu/drm/i915/Makefile
> +++ b/drivers/gpu/drm/i915/Makefile
> @@ -3,60 +3,70 @@
> # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
>
> ccflags-y := -Iinclude/drm
> -i915-y := i915_drv.o i915_dma.o i915_irq.o \
> - i915_gpu_error.o \
> +
> +# Please keep these built lists sorted!
Hmm hmm, if you're going all OCD, shouldn't that be s/built/build/?
All in all I like this.
Jani.
> +
> +# core driver code
> +i915-y := i915_drv.o \
> + i915_params.o \
> i915_suspend.o \
> - i915_gem.o \
> + i915_sysfs.o \
> + intel_pm.o
> +i915-$(CONFIG_COMPAT) += i915_ioc32.o
> +i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o
> +
> +# GEM code
> +i915-y += i915_cmd_parser.o \
> i915_gem_context.o \
> i915_gem_debug.o \
> + i915_gem_dmabuf.o \
> i915_gem_evict.o \
> i915_gem_execbuffer.o \
> i915_gem_gtt.o \
> + i915_gem.o \
> i915_gem_stolen.o \
> i915_gem_tiling.o \
> - i915_cmd_parser.o \
> - i915_params.o \
> - i915_sysfs.o \
> + i915_gpu_error.o \
> + i915_irq.o \
> i915_trace_points.o \
> - i915_ums.o \
> + intel_ringbuffer.o \
> + intel_uncore.o
> +
> +# modesetting core code
> +i915-y += intel_bios.o \
> intel_display.o \
> - intel_crt.o \
> - intel_lvds.o \
> - intel_dsi.o \
> - intel_dsi_cmd.o \
> - intel_dsi_pll.o \
> - intel_bios.o \
> - intel_ddi.o \
> - intel_dp.o \
> - intel_hdmi.o \
> - intel_sdvo.o \
> intel_modes.o \
> - intel_panel.o \
> - intel_pm.o \
> - intel_i2c.o \
> - intel_tv.o \
> - intel_dvo.o \
> - intel_ringbuffer.o \
> - intel_overlay.o \
> - intel_sprite.o \
> intel_opregion.o \
> + intel_overlay.o \
> intel_sideband.o \
> - intel_uncore.o \
> + intel_sprite.o
> +i915-$(CONFIG_ACPI) += intel_acpi.o
> +i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o
> +
> +# modesetting output/encoder code
> +i915-y += dvo_ch7017.o \
> dvo_ch7xxx.o \
> - dvo_ch7017.o \
> dvo_ivch.o \
> - dvo_tfp410.o \
> - dvo_sil164.o \
> dvo_ns2501.o \
> - i915_gem_dmabuf.o
> -
> -i915-$(CONFIG_COMPAT) += i915_ioc32.o
> -
> -i915-$(CONFIG_ACPI) += intel_acpi.o
> -
> -i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o
> + dvo_sil164.o \
> + dvo_tfp410.o \
> + intel_crt.o \
> + intel_ddi.o \
> + intel_dp.o \
> + intel_dsi_cmd.o \
> + intel_dsi.o \
> + intel_dsi_pll.o \
> + intel_dvo.o \
> + intel_hdmi.o \
> + intel_i2c.o \
> + intel_lvds.o \
> + intel_panel.o \
> + intel_sdvo.o \
> + intel_tv.o
>
> -i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o
> +# legacy horrors
> +i915-y += i915_dma.o \
> + i915_ums.o
>
> obj-$(CONFIG_DRM_I915) += i915.o
>
> --
> 1.8.5.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-03-07 11:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-07 8:55 [PATCH] drm/i915: Go OCD on the Makefile Daniel Vetter
2014-03-07 9:55 ` Chris Wilson
2014-03-07 11:12 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox