From: Jani Nikula <jani.nikula@intel.com>
To: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: intel-xe@lists.freedesktop.org, rodrigo.vivi@intel.com
Subject: Re: [Intel-xe] [PATCH 1/9] fixup! drm/xe/display: Implement display support
Date: Thu, 20 Apr 2023 11:49:46 +0300 [thread overview]
Message-ID: <87sfcvvsyd.fsf@intel.com> (raw)
In-Reply-To: <nqx26axz3idy7up674v7i3nobnu5hjtwuyrn46ghdbzp7c2qo3@bjczno54ijhb>
On Wed, 19 Apr 2023, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> On Wed, Apr 19, 2023 at 03:39:39PM +0300, Jani Nikula wrote:
>>Build the i915 display object files in i915-display sub-directory, to
>>increase clarity over what's coming from i915, and to simplify the rule
>>to build the object files.
>>
>>Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>>---
>> drivers/gpu/drm/xe/Makefile | 165 +++++++++++++++++-------------------
>> 1 file changed, 78 insertions(+), 87 deletions(-)
>>
>>diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
>>index aceca651de57..9fa4aaad6b8f 100644
>>--- a/drivers/gpu/drm/xe/Makefile
>>+++ b/drivers/gpu/drm/xe/Makefile
>>@@ -105,100 +105,20 @@ subdir-ccflags-$(CONFIG_DRM_XE_DISPLAY) += \
>> -Ddrm_i915_gem_object=xe_bo \
>> -Ddrm_i915_private=xe_device
>
> by leaving them on the same dir I was actually thinking if it would not
> be possible to add a display/Makefile so these additional defines here
> are added as subdir-ccflags only there.
This is my understanding, I may be wrong:
* If you want subdir-ccflags-y to only apply within a subdirectory, you
need to descend to the subdirectory using "obj-y += subdir" and have a
standalone Makefile.
* If you use "include $(src)/subdir/Makefile", subdir-ccflags-y
specified there applies to the parent directory.
* If you descend to the subdirectory using "obj-y += subdir", I don't
think you can have the parent and subdirectory Makefiles add objects
to the same module.
> could we still do something like that for both display/ and i915-display/?
>
>
> Also wondering if the part about being easy to track could be
> accomplished by just having 2 `xe-$(CONFIG_DRM_XE_DISPLAY) +=`
> with a comment above it or if being on separate dirs is a requirement.
>
>
> anyway.... I'm ok with this
>
>
> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Thanks,
Jani.
>
> Lucas De Marchi
>
>>
>>-CFLAGS_display/intel_fbdev.o = $(call cc-disable-warning, override-init)
>>+CFLAGS_i915-display/intel_fbdev.o = $(call cc-disable-warning, override-init)
>>
>>-$(obj)/display/i915_%.o: $(srctree)/drivers/gpu/drm/i915/display/i915_%.c FORCE
>>+# Rule to build display code shared with i915
>>+$(obj)/i915-display/%.o: $(srctree)/drivers/gpu/drm/i915/display/%.c FORCE
>> $(call cmd,force_checksrc)
>> $(call if_changed_rule,cc_o_c)
>>
>>-
>>-$(obj)/display/skl_%.o: $(srctree)/drivers/gpu/drm/i915/display/skl_%.c FORCE
>>- $(call cmd,force_checksrc)
>>- $(call if_changed_rule,cc_o_c)
>>-
>>-$(obj)/display/icl_dsi.o: $(srctree)/drivers/gpu/drm/i915/display/icl_dsi.c FORCE
>>- $(call cmd,force_checksrc)
>>- $(call if_changed_rule,cc_o_c)
>>-
>>-$(obj)/display/intel_%.o: $(srctree)/drivers/gpu/drm/i915/display/intel_%.c FORCE
>>- $(call cmd,force_checksrc)
>>- $(call if_changed_rule,cc_o_c)
>>-
>>-# Display..
>>+# Display code specific to xe
>> xe-$(CONFIG_DRM_XE_DISPLAY) += \
>> xe_display.o \
>>- display/icl_dsi.o \
>>- display/intel_atomic.o \
>>- display/intel_atomic_plane.o \
>>- display/intel_audio.o \
>>- display/intel_backlight.o \
>>- display/intel_bios.o \
>>- display/intel_bw.o \
>>- display/intel_cdclk.o \
>>- display/intel_color.o \
>>- display/intel_combo_phy.o \
>>- display/intel_connector.o \
>>- display/intel_crtc_state_dump.o \
>>- display/intel_crtc.o \
>>- display/intel_cursor.o \
>>- display/intel_ddi_buf_trans.o \
>>- display/intel_ddi.o \
>>- display/intel_display.o \
>>- display/intel_display_debugfs.o \
>>- display/intel_display_power.o \
>>- display/intel_display_power_map.o \
>>- display/intel_display_power_well.o \
>>- display/intel_display_trace.o \
>>- display/intel_dkl_phy.o \
>>- display/intel_dmc.o \
>>- display/intel_dp_aux_backlight.o \
>>- display/intel_dp_aux.o \
>>- display/intel_dp.o \
>>- display/intel_dp_hdcp.o \
>>- display/intel_dp_link_training.o \
>>- display/intel_dp_mst.o \
>>- display/intel_dpll.o \
>>- display/intel_dpll_mgr.o \
>>- display/intel_dpt.o \
>>- display/intel_drrs.o \
>>- display/intel_dsb.o \
>>- display/intel_dsi.o \
>>- display/intel_dsi_dcs_backlight.o \
>>- display/intel_dsi_vbt.o \
>>- display/intel_fb.o \
>>- display/intel_fbc.o \
>>- display/intel_fdi.o \
>>- display/intel_fifo_underrun.o \
>>- display/intel_frontbuffer.o \
>>- display/intel_global_state.o \
>>- display/intel_gmbus.o \
>>- display/intel_hdcp.o \
>>- display/intel_hdmi.o \
>>- display/intel_hotplug.o \
>>- display/intel_hti.o \
>>- display/intel_lspcon.o \
>>- display/intel_modeset_setup.o \
>>- display/intel_modeset_verify.o \
>>- display/intel_panel.o \
>>- display/intel_pipe_crc.o \
>>- display/intel_pps.o \
>>- display/intel_psr.o \
>>- display/intel_qp_tables.o \
>>- display/intel_quirks.o \
>>- display/intel_snps_phy.o \
>>- display/intel_tc.o \
>>- display/intel_vblank.o \
>>- display/intel_vdsc.o \
>>- display/intel_vga.o \
>>- display/intel_vrr.o \
>>- display/intel_wm.o \
>> display/xe_fb_pin.o \
>> display/xe_hdcp_gsc.o \
>> display/xe_plane_initial.o \
>> display/xe_display_rps.o \
>>- display/skl_scaler.o \
>>- display/skl_universal_plane.o \
>>- display/skl_watermark.o \
>> display/ext/i915_irq.o \
>> display/ext/i9xx_wm.o \
>> display/ext/intel_device_info.o \
>>@@ -206,14 +126,85 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
>> display/ext/intel_pch.o \
>> display/ext/intel_pm.o
>>
>>+# Display code shared with i915
>>+xe-$(CONFIG_DRM_XE_DISPLAY) += \
>>+ i915-display/icl_dsi.o \
>>+ i915-display/intel_atomic.o \
>>+ i915-display/intel_atomic_plane.o \
>>+ i915-display/intel_audio.o \
>>+ i915-display/intel_backlight.o \
>>+ i915-display/intel_bios.o \
>>+ i915-display/intel_bw.o \
>>+ i915-display/intel_cdclk.o \
>>+ i915-display/intel_color.o \
>>+ i915-display/intel_combo_phy.o \
>>+ i915-display/intel_connector.o \
>>+ i915-display/intel_crtc.o \
>>+ i915-display/intel_crtc_state_dump.o \
>>+ i915-display/intel_cursor.o \
>>+ i915-display/intel_ddi.o \
>>+ i915-display/intel_ddi_buf_trans.o \
>>+ i915-display/intel_display.o \
>>+ i915-display/intel_display_debugfs.o \
>>+ i915-display/intel_display_power.o \
>>+ i915-display/intel_display_power_map.o \
>>+ i915-display/intel_display_power_well.o \
>>+ i915-display/intel_display_trace.o \
>>+ i915-display/intel_dkl_phy.o \
>>+ i915-display/intel_dmc.o \
>>+ i915-display/intel_dp.o \
>>+ i915-display/intel_dp_aux.o \
>>+ i915-display/intel_dp_aux_backlight.o \
>>+ i915-display/intel_dp_hdcp.o \
>>+ i915-display/intel_dp_link_training.o \
>>+ i915-display/intel_dp_mst.o \
>>+ i915-display/intel_dpll.o \
>>+ i915-display/intel_dpll_mgr.o \
>>+ i915-display/intel_dpt.o \
>>+ i915-display/intel_drrs.o \
>>+ i915-display/intel_dsb.o \
>>+ i915-display/intel_dsi.o \
>>+ i915-display/intel_dsi_dcs_backlight.o \
>>+ i915-display/intel_dsi_vbt.o \
>>+ i915-display/intel_fb.o \
>>+ i915-display/intel_fbc.o \
>>+ i915-display/intel_fdi.o \
>>+ i915-display/intel_fifo_underrun.o \
>>+ i915-display/intel_frontbuffer.o \
>>+ i915-display/intel_global_state.o \
>>+ i915-display/intel_gmbus.o \
>>+ i915-display/intel_hdcp.o \
>>+ i915-display/intel_hdmi.o \
>>+ i915-display/intel_hotplug.o \
>>+ i915-display/intel_hti.o \
>>+ i915-display/intel_lspcon.o \
>>+ i915-display/intel_modeset_setup.o \
>>+ i915-display/intel_modeset_verify.o \
>>+ i915-display/intel_panel.o \
>>+ i915-display/intel_pipe_crc.o \
>>+ i915-display/intel_pps.o \
>>+ i915-display/intel_psr.o \
>>+ i915-display/intel_qp_tables.o \
>>+ i915-display/intel_quirks.o \
>>+ i915-display/intel_snps_phy.o \
>>+ i915-display/intel_tc.o \
>>+ i915-display/intel_vblank.o \
>>+ i915-display/intel_vdsc.o \
>>+ i915-display/intel_vga.o \
>>+ i915-display/intel_vrr.o \
>>+ i915-display/intel_wm.o \
>>+ i915-display/skl_scaler.o \
>>+ i915-display/skl_universal_plane.o \
>>+ i915-display/skl_watermark.o
>>+
>> ifeq ($(CONFIG_ACPI),y)
>> xe-$(CONFIG_DRM_XE_DISPLAY) += \
>>- display/intel_acpi.o \
>>- display/intel_opregion.o
>>+ i915-display/intel_acpi.o \
>>+ i915-display/intel_opregion.o
>> endif
>>
>> ifeq ($(CONFIG_DRM_FBDEV_EMULATION),y)
>>- xe-$(CONFIG_DRM_XE_DISPLAY) += display/intel_fbdev.o
>>+ xe-$(CONFIG_DRM_XE_DISPLAY) += i915-display/intel_fbdev.o
>> endif
>>
>> obj-$(CONFIG_DRM_XE) += xe.o
>>--
>>2.39.2
>>
--
Jani Nikula, Intel Open Source Graphics Center
next prev parent reply other threads:[~2023-04-20 8:49 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-19 12:39 [Intel-xe] [PATCH 0/9] xe & i915 display integration cleanups Jani Nikula
2023-04-19 12:39 ` [Intel-xe] [PATCH 1/9] fixup! drm/xe/display: Implement display support Jani Nikula
2023-04-19 21:56 ` Lucas De Marchi
2023-04-20 8:49 ` Jani Nikula [this message]
2023-04-21 21:27 ` Lucas De Marchi
2023-04-24 11:41 ` Jani Nikula
2023-04-19 12:39 ` [Intel-xe] [PATCH 2/9] drm/i915/wm: remove stale and unused ilk_wm_max_level() declaration Jani Nikula
2023-04-19 19:35 ` Rodrigo Vivi
2023-04-19 19:49 ` Rodrigo Vivi
2023-04-19 19:50 ` Jani Nikula
2023-04-19 12:39 ` [Intel-xe] [PATCH 3/9] drm/i915/display: add I915 conditional build to i9xx_wm.h Jani Nikula
2023-04-19 19:35 ` Rodrigo Vivi
2023-04-19 12:39 ` [Intel-xe] [PATCH 4/9] fixup! drm/xe/display: Implement display support Jani Nikula
2023-04-19 12:39 ` [Intel-xe] [PATCH 5/9] drm/i915: rename intel_pm.[ch] to intel_clock_gating.[ch] Jani Nikula
2023-04-19 12:39 ` [Intel-xe] [PATCH 6/9] fixup! drm/xe/display: Implement display support Jani Nikula
2023-04-19 12:39 ` [Intel-xe] [PATCH 7/9] drm/i915: use explicit includes for i915_reg.h and i915_irq.h Jani Nikula
2023-04-19 19:36 ` Rodrigo Vivi
2023-04-19 12:39 ` [Intel-xe] [PATCH 8/9] fixup! drm/xe/display: Implement display support Jani Nikula
2023-04-19 12:39 ` [Intel-xe] [PATCH 9/9] fixup! drm/i915/display: Remaining changes to make xe compile Jani Nikula
2023-04-19 12:43 ` [Intel-xe] ✓ CI.Patch_applied: success for xe & i915 display integration cleanups Patchwork
2023-04-19 12:44 ` [Intel-xe] ✓ CI.KUnit: " Patchwork
2023-04-19 12:48 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-04-19 13:10 ` [Intel-xe] ○ CI.BAT: info " Patchwork
2023-04-19 19:33 ` [Intel-xe] [PATCH 0/9] " Rodrigo Vivi
2023-04-20 19:30 ` Rodrigo Vivi
2023-04-20 19:59 ` Jani Nikula
2023-04-21 21:29 ` [Intel-xe] ✗ CI.Patch_applied: failure for xe & i915 display integration cleanups (rev2) Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87sfcvvsyd.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=lucas.demarchi@intel.com \
--cc=rodrigo.vivi@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.