[Intel-xe] [RFC PATCH v2 01/23] fixup! drm/i915/display: Remaining changes to make xe compile

Jouni Högander jouni.hogander at intel.com
Wed May 10 12:11:30 UTC 2023


Remove unnecessary change causing conflict when reverting frontbuffer
tracking removal patches.

Signed-off-by: Jouni Högander <jouni.hogander at intel.com>
---
 drivers/gpu/drm/i915/display/intel_fb.c | 4 +++-
 1 file 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 015aacbad1b1..24637199c274 100644
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -1893,7 +1893,9 @@ static int intel_user_framebuffer_dirty(struct drm_framebuffer *fb,
 					struct drm_clip_rect *clips,
 					unsigned int num_clips)
 {
-	i915_gem_object_flush_if_display(intel_fb_obj(fb));
+	struct drm_i915_gem_object *obj = intel_fb_obj(fb);
+
+	i915_gem_object_flush_if_display(obj);
 	intel_frontbuffer_flush(to_intel_framebuffer(fb), ORIGIN_DIRTYFB);
 
 	return 0;
-- 
2.34.1



More information about the Intel-xe mailing list