From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com
Subject: [Intel-gfx] [PATCH 4/5] drm/i915: split out gem/i915_gem_userptr.h from i915_drv.h
Date: Fri, 7 Jan 2022 15:20:51 +0200 [thread overview]
Message-ID: <20220107132126.133801-4-jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1641561552.git.jani.nikula@intel.com>
We already have the gem/i915_gem_userptr.c file.
Acked-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 1 +
drivers/gpu/drm/i915/gem/i915_gem_userptr.h | 14 ++++++++++++++
drivers/gpu/drm/i915/i915_drv.h | 2 --
drivers/gpu/drm/i915/i915_gem.c | 1 +
4 files changed, 16 insertions(+), 2 deletions(-)
create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_userptr.h
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
index 3cc01c30dd62..6d1a71d6404c 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
@@ -42,6 +42,7 @@
#include "i915_drv.h"
#include "i915_gem_ioctls.h"
#include "i915_gem_object.h"
+#include "i915_gem_userptr.h"
#include "i915_scatterlist.h"
#ifdef CONFIG_MMU_NOTIFIER
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.h b/drivers/gpu/drm/i915/gem/i915_gem_userptr.h
new file mode 100644
index 000000000000..8dadb2f8436d
--- /dev/null
+++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.h
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2021 Intel Corporation
+ */
+
+#ifndef __I915_GEM_USERPTR_H__
+#define __I915_GEM_USERPTR_H__
+
+struct drm_i915_private;
+
+int i915_gem_init_userptr(struct drm_i915_private *dev_priv);
+void i915_gem_cleanup_userptr(struct drm_i915_private *dev_priv);
+
+#endif /* __I915_GEM_USERPTR_H__ */
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 606027a24fc3..83f656e116f0 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1603,8 +1603,6 @@ intel_vm_no_concurrent_access_wa(struct drm_i915_private *i915)
}
/* i915_gem.c */
-int i915_gem_init_userptr(struct drm_i915_private *dev_priv);
-void i915_gem_cleanup_userptr(struct drm_i915_private *dev_priv);
void i915_gem_init_early(struct drm_i915_private *dev_priv);
void i915_gem_cleanup_early(struct drm_i915_private *dev_priv);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index e3730096abd9..3729ec01b5bc 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -45,6 +45,7 @@
#include "gem/i915_gem_ioctls.h"
#include "gem/i915_gem_mman.h"
#include "gem/i915_gem_region.h"
+#include "gem/i915_gem_userptr.h"
#include "gt/intel_engine_user.h"
#include "gt/intel_gt.h"
#include "gt/intel_gt_pm.h"
--
2.30.2
next prev parent reply other threads:[~2022-01-07 13:21 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-07 13:20 [Intel-gfx] [PATCH 0/5] drm/i915: clean up i915_drv.h, part 1 Jani Nikula
2022-01-07 13:20 ` [Intel-gfx] [PATCH 1/5] drm/i915: split out i915_getparam.h from i915_drv.h Jani Nikula
2022-01-07 13:20 ` [Intel-gfx] [PATCH 2/5] drm/i915: split out i915_cmd_parser.h " Jani Nikula
2022-01-07 13:20 ` [Intel-gfx] [PATCH 3/5] drm/i915: split out i915_gem_evict.h " Jani Nikula
2022-01-07 13:20 ` [Intel-gfx] [PATCH 4/5] drm/i915: split out gem/i915_gem_userptr.h " Jani Nikula
2022-01-07 13:20 ` [Intel-gfx] [PATCH 5/5] drm/i915: split out gem/i915_gem_tiling.h " Jani Nikula
2022-01-07 13:20 ` [Intel-gfx] [PATCH 1/5] drm/i915: split out i915_getparam.h " Jani Nikula
2022-01-07 13:20 ` [Intel-gfx] [PATCH 2/5] drm/i915: split out i915_cmd_parser.h " Jani Nikula
2022-01-07 13:20 ` [Intel-gfx] [PATCH 3/5] drm/i915: split out i915_gem_evict.h " Jani Nikula
2022-01-07 13:20 ` Jani Nikula [this message]
2022-01-07 13:20 ` [Intel-gfx] [PATCH 5/5] drm/i915: split out gem/i915_gem_tiling.h " Jani Nikula
2022-01-07 13:25 ` [Intel-gfx] [PATCH 0/5] drm/i915: clean up i915_drv.h, part 1 Jani Nikula
2022-01-10 14:25 ` Jani Nikula
2022-01-07 13:29 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2022-01-07 13:30 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2022-01-07 13:58 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-01-07 18:18 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " 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=20220107132126.133801-4-jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-gfx@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