From: "Jouni Högander" <jouni.hogander@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: "Jouni Högander" <jouni.hogander@intel.com>
Subject: [PATCH v2 7/9] fixup! FIXME: drm/i915/display: Remaining changes to make xe compile
Date: Thu, 7 Dec 2023 15:00:44 +0200 [thread overview]
Message-ID: <20231207130046.2350822-8-jouni.hogander@intel.com> (raw)
In-Reply-To: <20231207130046.2350822-1-jouni.hogander@intel.com>
We have already i915_ggtt_offset in our compatibility headers. Remove
useless ifdefs.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
drivers/gpu/drm/i915/display/intel_display_types.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index db20dd7e5c0d..a685c527c7d1 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -2105,11 +2105,7 @@ intel_crtc_needs_color_update(const struct intel_crtc_state *crtc_state)
static inline u32 intel_plane_ggtt_offset(const struct intel_plane_state *plane_state)
{
-#ifdef I915
return i915_ggtt_offset(plane_state->ggtt_vma);
-#else
- return plane_state->ggtt_vma->node.start;
-#endif
}
static inline struct intel_frontbuffer *
--
2.34.1
next prev parent reply other threads:[~2023-12-07 13:01 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-07 13:00 [PATCH v2 0/9] Handle remaining ifdefs in hack patch Jouni Högander
2023-12-07 13:00 ` [PATCH v2 1/9] fixup! FIXME: drm/i915/display: Remaining changes to make xe compile Jouni Högander
2023-12-07 13:00 ` [PATCH v2 2/9] drm/i915/display: Use i915_gem_object_get_dma_address to get dma address Jouni Högander
2023-12-07 13:00 ` [PATCH v2 3/9] fixup! drm/xe/display: Implement display support Jouni Högander
2023-12-07 13:00 ` [PATCH v2 4/9] " Jouni Högander
2023-12-07 13:00 ` [PATCH v2 5/9] " Jouni Högander
2023-12-07 13:00 ` [PATCH v2 6/9] fixup! FIXME: drm/i915/display: Remaining changes to make xe compile Jouni Högander
2023-12-07 13:00 ` Jouni Högander [this message]
2023-12-07 13:00 ` [PATCH v2 8/9] fixup! drm/xe/display: Implement display support Jouni Högander
2023-12-07 13:00 ` [PATCH v2 9/9] fixup! FIXME: drm/i915/display: Remaining changes to make xe compile Jouni Högander
2023-12-07 15:06 ` Maarten Lankhorst
2023-12-07 14:17 ` ✓ CI.Patch_applied: success for Handle remaining ifdefs in hack patch (rev2) Patchwork
2023-12-07 14:17 ` ✗ CI.checkpatch: warning " Patchwork
2023-12-07 14:18 ` ✓ CI.KUnit: success " Patchwork
2023-12-07 14:25 ` ✓ CI.Build: " Patchwork
2023-12-07 14:26 ` ✓ CI.Hooks: " Patchwork
2023-12-07 14:27 ` ✗ CI.checksparse: warning " Patchwork
2023-12-07 15:02 ` ✓ CI.BAT: success " 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=20231207130046.2350822-8-jouni.hogander@intel.com \
--to=jouni.hogander@intel.com \
--cc=intel-xe@lists.freedesktop.org \
/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