Re: [Intel-xe] [PATCH v2 0/9] Intel_fbdev.c refactoring

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

On Tue, Nov 14, 2023 at 03:04:34PM +0200, Jouni Högander wrote:
> This patch set is removing all the ifdefs from intel_fbdev.c. This is
> done by splitting i915 specific code into it's own source file and
> similar source file is created for Xe for Xe specific code.
> 
> Remaining ifdefs are dropped by adding some compatibility headers.
> 
> Some of the patches are similar as in set from Maarten Lankhorst
> <maarten.lankhorst@linux.intel.com>:
> 
> https://patchwork.freedesktop.org/series/126200/
> 
> Patches 3 and 9 are supposed to be sent to
> intel-gfx@lists.freedesktop.org. Let's first agree if this is
> acceptable solution from Xe point of view.
> 
> v2: Add missing forward declarations into intel_fbdev_fb.h
> 
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
for the series.

We can push the i915 here as well and after landing in drm-intel-next
we can replace them by the proper cherry-pick -x

> 
> Jouni Högander (9):
>   Revert "FIXME: drm/i915/display: Allow fbdev to allocate stolen
>     memory"
>   fixup! FIXME: drm/i915/display: Remaining changes to make xe compile
>   drm/i915/display: split i915 specific code from intel_fbdev
>   fixup! drm/xe/display: Implement display support
>   fixup! drm/xe/display: Implement display support
>   fixup! drm/xe/display: Implement display support
>   fixup! drm/xe/display: Implement display support
>   fixup! drm/xe/display: Implement display support
>   drm/i915/display: use intel_bo_to_drm_bo in intel_fbdev
> 
>  drivers/gpu/drm/i915/Makefile                 |   3 +-
>  drivers/gpu/drm/i915/display/intel_fbdev.c    | 203 +-----------------
>  drivers/gpu/drm/i915/display/intel_fbdev_fb.c | 116 ++++++++++
>  drivers/gpu/drm/i915/display/intel_fbdev_fb.h |  21 ++
>  drivers/gpu/drm/xe/Makefile                   |   1 +
>  .../compat-i915-headers/gem/i915_gem_mman.h   |  17 ++
>  .../compat-i915-headers/gem/i915_gem_object.h |  11 +
>  .../gem/i915_gem_object_frontbuffer.h         |   4 +-
>  .../gpu/drm/xe/compat-i915-headers/i915_drv.h |   2 +
>  .../xe/compat-i915-headers/i915_gem_stolen.h  |   4 +-
>  .../gpu/drm/xe/compat-i915-headers/i915_vma.h |   6 +
>  drivers/gpu/drm/xe/display/intel_fbdev_fb.c   | 101 +++++++++
>  drivers/gpu/drm/xe/display/intel_fbdev_fb.h   |  21 ++
>  13 files changed, 312 insertions(+), 198 deletions(-)
>  create mode 100644 drivers/gpu/drm/i915/display/intel_fbdev_fb.c
>  create mode 100644 drivers/gpu/drm/i915/display/intel_fbdev_fb.h
>  create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_mman.h
>  create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h
>  create mode 100644 drivers/gpu/drm/xe/display/intel_fbdev_fb.c
>  create mode 100644 drivers/gpu/drm/xe/display/intel_fbdev_fb.h
> 
> -- 
> 2.34.1
>