From: "Jouni Högander" <jouni.hogander@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: jani.nikula@intel.com, rodrigo.vivi@kernel.org,
"Jouni Högander" <jouni.hogander@intel.com>,
ville.syrjala@linux.intel.com
Subject: [Intel-xe] [RFC PATCH v2 01/23] fixup! drm/i915/display: Remaining changes to make xe compile
Date: Wed, 10 May 2023 15:11:30 +0300 [thread overview]
Message-ID: <20230510121152.736148-2-jouni.hogander@intel.com> (raw)
In-Reply-To: <20230510121152.736148-1-jouni.hogander@intel.com>
Remove unnecessary change causing conflict when reverting frontbuffer
tracking removal patches.
Signed-off-by: Jouni Högander <jouni.hogander@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
next prev parent reply other threads:[~2023-05-10 12:12 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-10 12:11 [Intel-xe] [RFC PATCH v2 00/23] Xe frontbuffer tracking Jouni Högander
2023-05-10 12:11 ` Jouni Högander [this message]
2023-05-10 12:11 ` [Intel-xe] [RFC PATCH v2 02/23] Revert "drm/i915/display: Neuter frontbuffer tracking harder" Jouni Högander
2023-05-10 12:11 ` [Intel-xe] [RFC PATCH v2 03/23] Revert "drm/i915: Remove gem and overlay frontbuffer tracking" Jouni Högander
2023-05-10 12:11 ` [Intel-xe] [RFC PATCH v2 04/23] fixup! drm/i915/display: Remaining changes to make xe compile Jouni Högander
2023-05-10 12:11 ` [Intel-xe] [RFC PATCH v2 05/23] fixup! drm/xe/display: Implement display support Jouni Högander
2023-05-10 12:11 ` [Intel-xe] [RFC PATCH v2 06/23] drm/i915: Add macros to get i915 device from i915_gem_object Jouni Högander
2023-05-10 12:11 ` [Intel-xe] [RFC PATCH v2 07/23] drm/xe: Add macro to get i915 device from xe_bo Jouni Högander
2023-05-10 12:11 ` [Intel-xe] [RFC PATCH v2 08/23] drm/i915: Add getter for i915_gem_object->frontbuffer Jouni Högander
2023-05-10 12:11 ` [Intel-xe] [RFC PATCH v2 09/23] drm/xe: Add frontbuffer setter/getter for xe_bo Jouni Högander
2023-05-10 12:11 ` [Intel-xe] [RFC PATCH v2 10/23] drm/i915/display: Remove i915_gem_object_types.h from intel_frontbuffer.h Jouni Högander
2023-05-10 12:11 ` [Intel-xe] [RFC PATCH v2 11/23] drm/xe: Add intel_bo_flush_if_display define for Xe Jouni Högander
2023-05-10 12:11 ` [Intel-xe] [RFC PATCH v2 12/23] drm/i915: Add intel_bo_flush_if_display define for i915 Jouni Högander
2023-05-10 12:11 ` [Intel-xe] [RFC PATCH v2 13/23] drm/xe: Add struct i915_active for Xe Jouni Högander
2023-05-10 12:11 ` [Intel-xe] [RFC PATCH v2 14/23] drm/xe: Add i915_active.h compatibility header Jouni Högander
2023-05-10 12:11 ` [Intel-xe] [RFC PATCH v2 15/23] drm/xe/display: Include i916_active header Jouni Högander
2023-05-10 12:11 ` [Intel-xe] [RFC PATCH v2 16/23] drm/i915: Add function to clear scanout flag for vmas Jouni Högander
2023-05-10 12:11 ` [Intel-xe] [RFC PATCH v2 17/23] drm/xe: Add empty define for i915_ggtt_clear_scanout Jouni Högander
2023-05-10 12:11 ` [Intel-xe] [RFC PATCH v2 18/23] drm/i915/display: Use i915_ggtt_clear_scanout Jouni Högander
2023-05-10 12:11 ` [Intel-xe] [RFC PATCH v2 19/23] drm/i915/display: Use drm_gem_object_get/put Jouni Högander
2023-05-10 12:11 ` [Intel-xe] [RFC PATCH v2 20/23] drm/xe/display: Use frontbuffer tracking for Xe as well Jouni Högander
2023-05-10 12:11 ` [Intel-xe] [RFC PATCH v2 21/23] drm/i915: Add new frontbuffer tracking interface to queue flush Jouni Högander
2023-05-10 12:11 ` [Intel-xe] [RFC PATCH v2 22/23] drm/i915: Handle dma fences in dirtyfb callback Jouni Högander
2023-07-13 20:08 ` Ville Syrjälä
2023-07-27 5:44 ` Hogander, Jouni
2023-05-10 12:11 ` [Intel-xe] [RFC PATCH v2 23/23] drm/xe/display: Use custom dirtyfb for Xe as well Jouni Högander
2023-05-10 12:16 ` [Intel-xe] ✓ CI.Patch_applied: success for Xe frontbuffer tracking (rev2) Patchwork
2023-05-10 12:18 ` [Intel-xe] ✓ CI.KUnit: " Patchwork
2023-05-10 12:21 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-05-10 12:47 ` [Intel-xe] ○ CI.BAT: info " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230510121152.736148-2-jouni.hogander@intel.com \
--to=jouni.hogander@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=rodrigo.vivi@kernel.org \
--cc=ville.syrjala@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox