Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
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 4/9] fixup! drm/xe/display: Implement display support
Date: Thu,  7 Dec 2023 15:00:41 +0200	[thread overview]
Message-ID: <20231207130046.2350822-5-jouni.hogander@intel.com> (raw)
In-Reply-To: <20231207130046.2350822-1-jouni.hogander@intel.com>

We need to add i915_gem_object_read_from_page to build intel_display.c.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
 .../compat-i915-headers/gem/i915_gem_object.h | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h b/drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h
index b991069b5cb3..eaab536f465f 100644
--- a/drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h
@@ -17,4 +17,35 @@ static inline dma_addr_t i915_gem_object_get_dma_address(const struct xe_bo *bo,
 	return n;
 }
 
+static inline int i915_gem_object_read_from_page(struct xe_bo *bo,
+					  u32 ofs, u64 *ptr, u32 size)
+{
+	struct ttm_bo_kmap_obj map;
+	void *virtual;
+	bool is_iomem;
+	int ret;
+
+	XE_WARN_ON(size != 8);
+
+	ret = xe_bo_lock(bo, true);
+	if (ret)
+		return ret;
+
+	ret = ttm_bo_kmap(&bo->ttm, ofs >> PAGE_SHIFT, 1, &map);
+	if (ret)
+		goto out_unlock;
+
+	ofs &= ~PAGE_MASK;
+	virtual = ttm_kmap_obj_virtual(&map, &is_iomem);
+	if (is_iomem)
+		*ptr = readq((void __iomem *)(virtual + ofs));
+	else
+		*ptr = *(u64 *)(virtual + ofs);
+
+	ttm_bo_kunmap(&map);
+out_unlock:
+	xe_bo_unlock(bo);
+	return ret;
+}
+
 #endif
-- 
2.34.1


  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 ` Jouni Högander [this message]
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 ` [PATCH v2 7/9] " Jouni Högander
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-5-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