| Message ID | cover.1694514689.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | drm/i915: prepare for xe driver display integration | expand |
On Tue, Sep 12, 2023 at 02:06:27PM +0300, Jani Nikula wrote: > The upcoming drm/xe driver [1][2] will reuse the drm/i915 display code, > initially by compiling the relevant compilation units separately as part > of the xe driver. This series prepares for that in i915 side. > > The first patch defines I915 during the i915 driver build, to allow > conditional compilation based on the driver the code is being built for. > > The rest of the patches add stubs for functions in files that aren't > used in xe. The idea is that this is the least intrusive way of skipping > that code in xe, and is quite similar to the common kconfig stubs. > > While this is arguably unused code for the time being, or only used in > an out-of-tree driver yet to be upstreamed, the upstreaming has to start > somewhere. I see other benefits on adding this right now through drm-intel-next: 1. Separate the good&ready patches from the other patches that are in drm-xe-next, that would require more work. 2. Minimize the non-xe patches in the xe pull-request. Cleaner and with reduced risk of conflicts. > > > BR, > Jani. > > > [1] https://gitlab.freedesktop.org/drm/xe/kernel/-/tree/drm-xe-next > [2] https://patchwork.freedesktop.org/series/112188/ > > Cc: David Airlie <airlied@gmail.com> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> > Cc: Lucas De Marchi <lucas.demarchi@intel.com> Yeap, let's for sure get input from other maintainers, but meanwhile I'd like to state that I have once more reviewed these patches and that you can put my rv-b tag in all of them when we get the proper acks. > > Jani Nikula (19): > drm/i915: define I915 during i915 driver build > drm/i915/display: add I915 conditional build to intel_lvds.h > drm/i915/display: add I915 conditional build to hsw_ips.h > drm/i915/display: add I915 conditional build to i9xx_plane.h > drm/i915/display: add I915 conditional build to intel_lpe_audio.h > drm/i915/display: add I915 conditional build to intel_pch_refclk.h > drm/i915/display: add I915 conditional build to intel_pch_display.h > drm/i915/display: add I915 conditional build to intel_sprite.h > drm/i915/display: add I915 conditional build to intel_overlay.h > drm/i915/display: add I915 conditional build to g4x_dp.h > drm/i915/display: add I915 conditional build to intel_dpio_phy.h > drm/i915/display: add I915 conditional build to intel_crt.h > drm/i915/display: add I915 conditional build to vlv_dsi.h > drm/i915/display: add I915 conditional build to i9xx_wm.h > drm/i915/display: add I915 conditional build to g4x_hdmi.h > drm/i915/display: add I915 conditional build to intel_dvo.h > drm/i915/display: add I915 conditional build to intel_sdvo.h > drm/i915/display: add I915 conditional build to intel_tv.h > drm/i915/display: add I915 conditional build to vlv_dsi_pll.h > > drivers/gpu/drm/i915/Makefile | 4 + > drivers/gpu/drm/i915/display/g4x_dp.h | 26 +++++ > drivers/gpu/drm/i915/display/g4x_hdmi.h | 12 +++ > drivers/gpu/drm/i915/display/hsw_ips.h | 35 +++++++ > drivers/gpu/drm/i915/display/i9xx_plane.h | 23 +++++ > drivers/gpu/drm/i915/display/i9xx_wm.h | 17 ++++ > drivers/gpu/drm/i915/display/intel_crt.h | 14 +++ > drivers/gpu/drm/i915/display/intel_dpio_phy.h | 96 +++++++++++++++++++ > drivers/gpu/drm/i915/display/intel_dvo.h | 6 ++ > .../gpu/drm/i915/display/intel_lpe_audio.h | 18 ++++ > drivers/gpu/drm/i915/display/intel_lvds.h | 19 ++++ > drivers/gpu/drm/i915/display/intel_overlay.h | 35 +++++++ > .../gpu/drm/i915/display/intel_pch_display.h | 53 ++++++++++ > .../gpu/drm/i915/display/intel_pch_refclk.h | 23 +++++ > drivers/gpu/drm/i915/display/intel_sdvo.h | 13 +++ > drivers/gpu/drm/i915/display/intel_sprite.h | 8 ++ > drivers/gpu/drm/i915/display/intel_tv.h | 6 ++ > drivers/gpu/drm/i915/display/vlv_dsi.h | 13 +++ > drivers/gpu/drm/i915/display/vlv_dsi_pll.h | 9 ++ > 19 files changed, 430 insertions(+) > > -- > 2.39.2 >
On Thu, 14 Sep 2023, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote: > On Tue, Sep 12, 2023 at 02:06:27PM +0300, Jani Nikula wrote: >> The upcoming drm/xe driver [1][2] will reuse the drm/i915 display code, >> initially by compiling the relevant compilation units separately as part >> of the xe driver. This series prepares for that in i915 side. >> >> The first patch defines I915 during the i915 driver build, to allow >> conditional compilation based on the driver the code is being built for. >> >> The rest of the patches add stubs for functions in files that aren't >> used in xe. The idea is that this is the least intrusive way of skipping >> that code in xe, and is quite similar to the common kconfig stubs. >> >> While this is arguably unused code for the time being, or only used in >> an out-of-tree driver yet to be upstreamed, the upstreaming has to start >> somewhere. > > I see other benefits on adding this right now through drm-intel-next: > > 1. Separate the good&ready patches from the other patches that are in > drm-xe-next, that would require more work. > 2. Minimize the non-xe patches in the xe pull-request. Cleaner and with > reduced risk of conflicts. > >> >> >> BR, >> Jani. >> >> >> [1] https://gitlab.freedesktop.org/drm/xe/kernel/-/tree/drm-xe-next >> [2] https://patchwork.freedesktop.org/series/112188/ >> >> Cc: David Airlie <airlied@gmail.com> >> Cc: Daniel Vetter <daniel@ffwll.ch> >> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> >> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> >> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> >> Cc: Lucas De Marchi <lucas.demarchi@intel.com> > > Yeap, let's for sure get input from other maintainers, but meanwhile I'd > like to state that I have once more reviewed these patches and that > you can put my rv-b tag in all of them when we get the proper acks. Thanks. Pushed to drm-intel-next with Dave's IRC ack. BR, Jani. > >> >> Jani Nikula (19): >> drm/i915: define I915 during i915 driver build >> drm/i915/display: add I915 conditional build to intel_lvds.h >> drm/i915/display: add I915 conditional build to hsw_ips.h >> drm/i915/display: add I915 conditional build to i9xx_plane.h >> drm/i915/display: add I915 conditional build to intel_lpe_audio.h >> drm/i915/display: add I915 conditional build to intel_pch_refclk.h >> drm/i915/display: add I915 conditional build to intel_pch_display.h >> drm/i915/display: add I915 conditional build to intel_sprite.h >> drm/i915/display: add I915 conditional build to intel_overlay.h >> drm/i915/display: add I915 conditional build to g4x_dp.h >> drm/i915/display: add I915 conditional build to intel_dpio_phy.h >> drm/i915/display: add I915 conditional build to intel_crt.h >> drm/i915/display: add I915 conditional build to vlv_dsi.h >> drm/i915/display: add I915 conditional build to i9xx_wm.h >> drm/i915/display: add I915 conditional build to g4x_hdmi.h >> drm/i915/display: add I915 conditional build to intel_dvo.h >> drm/i915/display: add I915 conditional build to intel_sdvo.h >> drm/i915/display: add I915 conditional build to intel_tv.h >> drm/i915/display: add I915 conditional build to vlv_dsi_pll.h >> >> drivers/gpu/drm/i915/Makefile | 4 + >> drivers/gpu/drm/i915/display/g4x_dp.h | 26 +++++ >> drivers/gpu/drm/i915/display/g4x_hdmi.h | 12 +++ >> drivers/gpu/drm/i915/display/hsw_ips.h | 35 +++++++ >> drivers/gpu/drm/i915/display/i9xx_plane.h | 23 +++++ >> drivers/gpu/drm/i915/display/i9xx_wm.h | 17 ++++ >> drivers/gpu/drm/i915/display/intel_crt.h | 14 +++ >> drivers/gpu/drm/i915/display/intel_dpio_phy.h | 96 +++++++++++++++++++ >> drivers/gpu/drm/i915/display/intel_dvo.h | 6 ++ >> .../gpu/drm/i915/display/intel_lpe_audio.h | 18 ++++ >> drivers/gpu/drm/i915/display/intel_lvds.h | 19 ++++ >> drivers/gpu/drm/i915/display/intel_overlay.h | 35 +++++++ >> .../gpu/drm/i915/display/intel_pch_display.h | 53 ++++++++++ >> .../gpu/drm/i915/display/intel_pch_refclk.h | 23 +++++ >> drivers/gpu/drm/i915/display/intel_sdvo.h | 13 +++ >> drivers/gpu/drm/i915/display/intel_sprite.h | 8 ++ >> drivers/gpu/drm/i915/display/intel_tv.h | 6 ++ >> drivers/gpu/drm/i915/display/vlv_dsi.h | 13 +++ >> drivers/gpu/drm/i915/display/vlv_dsi_pll.h | 9 ++ >> 19 files changed, 430 insertions(+) >> >> -- >> 2.39.2 >>