[Intel-xe] [PATCH] FIXME: drm/i915: More display ugly wa needed after rebase

[Rodrigo Vivi]

Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
---

This is an information on a new FIXME hack that is getting into
the tree after we complete the rebase on drm-tip.

Also this patch is needeed:
("drm/i915: Abstract display info away during probe")
https://patchwork.freedesktop.org/series/124474/

As well as a local fixup to:
75:  f1e2775bd1c4 ! 551:  ed3617c0414c FIXME: drm/i915: xe dpt integration
    @@ drivers/gpu/drm/i915/display/intel_fb.c: int intel_framebuffer_init(struct intel
                        }
                }
      
    --          fb->obj[i] = &obj->base;
    ++#ifdef I915
    +           fb->obj[i] = &obj->base;
    ++#else
     +          fb->obj[i] = &obj->ttm.base;
    ++#endif
        }

Thanks,
Rodrigo.

 drivers/gpu/drm/i915/display/intel_fb.c          | 2 +-
 drivers/gpu/drm/i915/display/intel_frontbuffer.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index 8492a2be5b1a..b7ca195ffa65 100644
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -1939,6 +1939,7 @@ struct frontbuffer_fence_cb {
 	struct intel_frontbuffer *front;
 };
 
+#ifdef I915
 static void intel_user_framebuffer_fence_wake(struct dma_fence *dma,
 					      struct dma_fence_cb *data)
 {
@@ -1949,7 +1950,6 @@ static void intel_user_framebuffer_fence_wake(struct dma_fence *dma,
 	dma_fence_put(dma);
 }
 
-#ifdef I915
 static int intel_user_framebuffer_dirty(struct drm_framebuffer *fb,
 					struct drm_file *file,
 					unsigned int flags, unsigned int color,
diff --git a/drivers/gpu/drm/i915/display/intel_frontbuffer.c b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
index a76e562e24b8..4c28b663ec04 100644
--- a/drivers/gpu/drm/i915/display/intel_frontbuffer.c
+++ b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
@@ -208,7 +208,9 @@ static void intel_frontbuffer_flush_work(struct work_struct *work)
 	struct intel_frontbuffer *front =
 		container_of(work, struct intel_frontbuffer, flush_work);
 
+#ifdef I915
 	i915_gem_object_flush_if_display(front->obj);
+#endif
 	intel_frontbuffer_flush(front, ORIGIN_DIRTYFB);
 	intel_frontbuffer_put(front);
 }
-- 
2.41.0