Re: [RFC] drm/i915: move i915 specific display adaptation files to display-adapt

[Rodrigo Vivi <rodrigo.vivi@intel.com>]

On Tue, Oct 21, 2025 at 12:00:27PM +0300, Jani Nikula wrote:
> On Thu, 16 Oct 2025, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> > On Wed, Oct 15, 2025 at 07:01:40PM +0300, Jani Nikula wrote:
> >> The display/ subdirectory currently contains files that are about i915
> >> core driver adaptation to display rather than generic display
> >> implementation. Move them to a new i915 subdirectory display-adapt/.
> >> 
> >> In the xe driver, all of its display/ is basically xe core adaptation to
> >> display. It's just that i915 display/ contains the actual display
> >> implementation for both. Ideally, we'd have the shared display code
> >> somewhere else, and the adaptation in i915 would be under display/, but
> >> we're not quite ready for that kind of churn yet. So let's just call it
> >> display-adapt for now.
> >> 
> >> xe basically has equivalent files to the ones that are being moved,
> >> apart from intel_dpt.c, for which the implementation is quite different.
> >> 
> >> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> >> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> >> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> >> ---
> >>  drivers/gpu/drm/i915/Makefile                 | 23 +++++++++++--------
> >>  .../{display => display-adapt}/intel_bo.c     |  3 ++-
> >>  .../intel_display_rpm.c                       |  5 ++--
> >>  .../{display => display-adapt}/intel_dpt.c    | 11 +++++----
> >>  .../intel_dsb_buffer.c                        |  5 ++--
> >>  .../{display => display-adapt}/intel_fb_bo.c  |  9 ++++----
> >>  .../{display => display-adapt}/intel_fb_pin.c | 14 +++++------
> >>  .../intel_fbdev_fb.c                          |  5 +++-
> >>  .../intel_hdcp_gsc.c                          |  2 +-
> >>  .../{display => display-adapt}/intel_panic.c  |  6 ++---
> >>  .../intel_plane_initial.c                     | 17 +++++++-------
> >>  11 files changed, 56 insertions(+), 44 deletions(-)
> >>  rename drivers/gpu/drm/i915/{display => display-adapt}/intel_bo.c (98%)
> >>  rename drivers/gpu/drm/i915/{display => display-adapt}/intel_display_rpm.c (95%)
> >>  rename drivers/gpu/drm/i915/{display => display-adapt}/intel_dpt.c (97%)
> >>  rename drivers/gpu/drm/i915/{display => display-adapt}/intel_dsb_buffer.c (96%)
> >>  rename drivers/gpu/drm/i915/{display => display-adapt}/intel_fb_bo.c (94%)
> >>  rename drivers/gpu/drm/i915/{display => display-adapt}/intel_fb_pin.c (97%)
> >>  rename drivers/gpu/drm/i915/{display => display-adapt}/intel_fbdev_fb.c (94%)
> >>  rename drivers/gpu/drm/i915/{display => display-adapt}/intel_hdcp_gsc.c (99%)
> >>  rename drivers/gpu/drm/i915/{display => display-adapt}/intel_panic.c (84%)
> >>  rename drivers/gpu/drm/i915/{display => display-adapt}/intel_plane_initial.c (97%)
> >
> > or perhaps we are ready to move everything else not in above list to
> > to drivers/gpu/drm/intel-display/ ?
> 
> That's probably the end goal, but I'm a bit hesitant to do it before
> we're closer to actually making it a dedicated kernel module. Doing it
> now would require hackish makefiles in both i915 and xe, now we only
> have it in xe. ;)

fair enough

> 
> > then keep i915/display like the xe/display both as this adapt layer
> > tending minimize or even die at some point?!
> 
> I kind of like having the display adaptation in a separate
> directory. Especially in xe it can be left out completely when
> CONFIG_DRM_XE_DISPLAY=n.

perhaps we rename xe/display to xe/display-adapt to just make the
equivalent consistency?!

but just a thought, not a blocker.

Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

on the idea here

> 
> BR,
> Jani.
> 
> 
> -- 
> Jani Nikula, Intel