[PATCH v3 0/9] Handle remaining ifdefs in hack patch

[Rodrigo Vivi]

On Fri, Dec 08, 2023 at 09:56:01AM +0200, Jouni Högander wrote:
> This is removing rest of the ifdefs added by hack patch
> "drm/i915/display: Remaining changes to make xe compile" after
> intel_fb.c refactoring set is merged (still under work):
> 
> https://patchwork.freedesktop.org/series/126505/
> 
> Many patches are identical with earlier set from Maarten Lankhorst
> <maarten.lankhorst at linux.intel.com>. They are just a reordered and
> split a bit more to make more clear what is changed and why:
> 
> https://patchwork.freedesktop.org/series/125685/

Pushed, now I"m going to take care of the clean-up rebase

> 
> Patch 2. is a backport from i915 driver tree.
> 
> v3: Rebase
> v2: Patch 2. backported
> 
> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Cc: Jani Nikula <jani.nikula at intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Cc: Uma Shankar <uma.shankar at intel.com>
> 
> Jouni Högander (8):
>   fixup! FIXME: drm/i915/display: Remaining changes to make xe compile
>   fixup! drm/xe/display: Implement display support
>   fixup! drm/xe/display: Implement display support
>   fixup! drm/xe/display: Implement display support
>   fixup! FIXME: drm/i915/display: Remaining changes to make xe compile
>   fixup! FIXME: drm/i915/display: Remaining changes to make xe compile
>   fixup! drm/xe/display: Implement display support
>   fixup! FIXME: drm/i915/display: Remaining changes to make xe compile
> 
> Maarten Lankhorst (1):
>   drm/i915/display: Use i915_gem_object_get_dma_address to get dma
>     address
> 
>  drivers/gpu/drm/i915/display/intel_cursor.c   | 12 +++---
>  drivers/gpu/drm/i915/display/intel_display.c  | 35 -----------------
>  .../drm/i915/display/intel_display_types.h    |  4 --
>  .../drm/i915/display/skl_universal_plane.c    |  4 --
>  .../compat-i915-headers/gem/i915_gem_lmem.h   |  1 +
>  .../compat-i915-headers/gem/i915_gem_object.h | 38 +++++++++++++++++++
>  .../gpu/drm/xe/compat-i915-headers/i915_vma.h |  6 +++
>  7 files changed, 51 insertions(+), 49 deletions(-)
>  create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_lmem.h
> 
> -- 
> 2.34.1
>