From: "Jouni Högander" <jouni.hogander@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: "Jouni Högander" <jouni.hogander@intel.com>
Subject: [PATCH v3 2/9] drm/i915/display: Use i915_gem_object_get_dma_address to get dma address
Date: Fri, 8 Dec 2023 09:56:03 +0200 [thread overview]
Message-ID: <20231208075610.3005795-3-jouni.hogander@intel.com> (raw)
In-Reply-To: <20231208075610.3005795-1-jouni.hogander@intel.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Works better for xe like that. obj is no longer const.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231204134946.16219-1-maarten.lankhorst@linux.intel.com
Reviewed-by: Jouni Högander <jouni.hogander@intel.com>
(cherry picked from commit 7054b551de18e9875fbdf8d4f3baade428353545)
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_cursor.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c
index b342fad180ca..0d21c34f7499 100644
--- a/drivers/gpu/drm/i915/display/intel_cursor.c
+++ b/drivers/gpu/drm/i915/display/intel_cursor.c
@@ -23,6 +23,8 @@
#include "intel_psr.h"
#include "skl_watermark.h"
+#include "gem/i915_gem_object.h"
+
/* Cursor formats */
static const u32 intel_cursor_formats[] = {
DRM_FORMAT_ARGB8888,
@@ -33,11 +35,11 @@ static u32 intel_cursor_base(const struct intel_plane_state *plane_state)
struct drm_i915_private *dev_priv =
to_i915(plane_state->uapi.plane->dev);
const struct drm_framebuffer *fb = plane_state->hw.fb;
- const struct drm_i915_gem_object *obj = intel_fb_obj(fb);
+ struct drm_i915_gem_object *obj = intel_fb_obj(fb);
u32 base;
if (DISPLAY_INFO(dev_priv)->cursor_needs_physical)
- base = sg_dma_address(obj->mm.pages->sgl);
+ base = i915_gem_object_get_dma_address(obj, 0);
else
base = intel_plane_ggtt_offset(plane_state);
--
2.34.1
next prev parent reply other threads:[~2023-12-08 7:56 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-08 7:56 [PATCH v3 0/9] Handle remaining ifdefs in hack patch Jouni Högander
2023-12-08 7:56 ` [PATCH v3 1/9] fixup! FIXME: drm/i915/display: Remaining changes to make xe compile Jouni Högander
2023-12-08 7:56 ` Jouni Högander [this message]
2023-12-08 7:56 ` [PATCH v3 3/9] fixup! drm/xe/display: Implement display support Jouni Högander
2023-12-08 7:56 ` [PATCH v3 4/9] " Jouni Högander
2023-12-08 7:56 ` [PATCH v3 5/9] " Jouni Högander
2023-12-08 7:56 ` [PATCH v3 6/9] fixup! FIXME: drm/i915/display: Remaining changes to make xe compile Jouni Högander
2023-12-08 7:56 ` [PATCH v3 7/9] " Jouni Högander
2023-12-08 7:56 ` [PATCH v3 8/9] fixup! drm/xe/display: Implement display support Jouni Högander
2023-12-08 7:56 ` [PATCH v3 9/9] fixup! FIXME: drm/i915/display: Remaining changes to make xe compile Jouni Högander
2023-12-08 14:15 ` ✓ CI.Patch_applied: success for Handle remaining ifdefs in hack patch (rev3) Patchwork
2023-12-08 14:16 ` ✗ CI.checkpatch: warning " Patchwork
2023-12-08 14:17 ` ✓ CI.KUnit: success " Patchwork
2023-12-08 14:24 ` ✓ CI.Build: " Patchwork
2023-12-08 14:24 ` ✓ CI.Hooks: " Patchwork
2023-12-08 14:26 ` ✗ CI.checksparse: warning " Patchwork
2023-12-08 15:02 ` ✓ CI.BAT: success " Patchwork
2023-12-08 16:49 ` [PATCH v3 0/9] Handle remaining ifdefs in hack patch Rodrigo Vivi
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=20231208075610.3005795-3-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