]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
drm/i915: split out i915_gem_internal.h from i915_drv.h
authorJani Nikula <jani.nikula@intel.com>
Thu, 10 Feb 2022 15:45:39 +0000 (17:45 +0200)
committerJani Nikula <jani.nikula@intel.com>
Fri, 11 Feb 2022 10:52:50 +0000 (12:52 +0200)
We already have the i915_gem_internal.c file.

Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/6715d1f3232c445990630bb3aac00f279f516fee.1644507885.git.jani.nikula@intel.com
31 files changed:
drivers/gpu/drm/i915/display/intel_dsb.c
drivers/gpu/drm/i915/display/intel_overlay.c
drivers/gpu/drm/i915/gem/i915_gem_internal.c
drivers/gpu/drm/i915/gem/i915_gem_internal.h [new file with mode: 0644]
drivers/gpu/drm/i915/gem/selftests/huge_pages.c
drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c
drivers/gpu/drm/i915/gt/gen6_ppgtt.c
drivers/gpu/drm/i915/gt/intel_engine_cs.c
drivers/gpu/drm/i915/gt/intel_gt.c
drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c
drivers/gpu/drm/i915/gt/intel_gtt.c
drivers/gpu/drm/i915/gt/intel_renderstate.c
drivers/gpu/drm/i915/gt/intel_ring.c
drivers/gpu/drm/i915/gt/intel_ring_submission.c
drivers/gpu/drm/i915/gt/intel_timeline.c
drivers/gpu/drm/i915/gt/selftest_execlists.c
drivers/gpu/drm/i915/gt/selftest_hangcheck.c
drivers/gpu/drm/i915/gt/selftest_lrc.c
drivers/gpu/drm/i915/gt/selftest_migrate.c
drivers/gpu/drm/i915/gt/selftest_rps.c
drivers/gpu/drm/i915/gt/selftest_workarounds.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_perf.c
drivers/gpu/drm/i915/selftests/i915_gem.c
drivers/gpu/drm/i915/selftests/i915_gem_evict.c
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
drivers/gpu/drm/i915/selftests/i915_request.c
drivers/gpu/drm/i915/selftests/i915_vma.c
drivers/gpu/drm/i915/selftests/igt_spinner.c

index 83a69a4a4fea84c6425a64e52fd915e921acac36..b34a67309976a8ba0ba9647a6351d15ade45186e 100644 (file)
@@ -4,6 +4,8 @@
  *
  */
 
+#include "gem/i915_gem_internal.h"
+
 #include "i915_drv.h"
 #include "intel_de.h"
 #include "intel_display_types.h"
index 5358f03b52db5f188f3ff100198d2b0623f100be..76845d34ad0c316fff35e125e9bf30f1a56892bf 100644 (file)
@@ -28,6 +28,7 @@
 
 #include <drm/drm_fourcc.h>
 
+#include "gem/i915_gem_internal.h"
 #include "gem/i915_gem_pm.h"
 #include "gt/intel_gpu_commands.h"
 #include "gt/intel_ring.h"
index c5150a1ee3d22fea1f9fadfa47133a4f79009043..c698f95af15fee0af3b5f04dd06799643474eed3 100644 (file)
@@ -10,6 +10,7 @@
 
 #include "i915_drv.h"
 #include "i915_gem.h"
+#include "i915_gem_internal.h"
 #include "i915_gem_object.h"
 #include "i915_scatterlist.h"
 #include "i915_utils.h"
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_internal.h b/drivers/gpu/drm/i915/gem/i915_gem_internal.h
new file mode 100644 (file)
index 0000000..6664e06
--- /dev/null
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2022 Intel Corporation
+ */
+
+#ifndef __I915_GEM_INTERNAL_H__
+#define __I915_GEM_INTERNAL_H__
+
+#include <linux/types.h>
+
+struct drm_i915_gem_object;
+struct drm_i915_gem_object_ops;
+struct drm_i915_private;
+
+struct drm_i915_gem_object *
+i915_gem_object_create_internal(struct drm_i915_private *i915,
+                               phys_addr_t size);
+struct drm_i915_gem_object *
+__i915_gem_object_create_internal(struct drm_i915_private *i915,
+                                 const struct drm_i915_gem_object_ops *ops,
+                                 phys_addr_t size);
+
+#endif /* __I915_GEM_INTERNAL_H__ */
index 11f0aa65f8a319ee69f23dd93fba8380a29ffcba..6af237aa1854aef9c0ba42d9dfc4571033d51b23 100644 (file)
@@ -8,9 +8,10 @@
 
 #include "i915_selftest.h"
 
-#include "gem/i915_gem_region.h"
+#include "gem/i915_gem_internal.h"
 #include "gem/i915_gem_lmem.h"
 #include "gem/i915_gem_pm.h"
+#include "gem/i915_gem_region.h"
 
 #include "gt/intel_gt.h"
 
index 7d327ffd0464891e74c14b3e3527a66556107734..85bf9ba727d76ee808b2d52e6438c52629f9c3a6 100644 (file)
@@ -6,6 +6,7 @@
 
 #include <linux/prime_numbers.h>
 
+#include "gem/i915_gem_internal.h"
 #include "gem/i915_gem_pm.h"
 #include "gt/intel_engine_pm.h"
 #include "gt/intel_engine_regs.h"
index c6291429b00cf1157b259ce0587149549283c017..65e37d3cbb9745e15a728466be77bab69c7cd8ae 100644 (file)
@@ -6,11 +6,13 @@
 
 #include <linux/prime_numbers.h>
 
+#include "gem/i915_gem_internal.h"
+#include "gem/i915_gem_region.h"
 #include "gt/intel_engine_pm.h"
 #include "gt/intel_gpu_commands.h"
 #include "gt/intel_gt.h"
 #include "gt/intel_gt_pm.h"
-#include "gem/i915_gem_region.h"
+
 #include "huge_gem_object.h"
 #include "i915_selftest.h"
 #include "selftests/i915_random.h"
index b35c1219c8521268a10b8f3bee35f6c93c75fa5c..3c55e77b0f1b00c2fffeb3323938274bbd382f7c 100644 (file)
@@ -7,6 +7,7 @@
 #include "igt_gem_utils.h"
 
 #include "gem/i915_gem_context.h"
+#include "gem/i915_gem_internal.h"
 #include "gem/i915_gem_pm.h"
 #include "gt/intel_context.h"
 #include "gt/intel_gpu_commands.h"
index 8471758b3ef4e1930a4b8d4bfed470ef5a46c3a9..0bd0d611e0c830bdc7896689e700c2cd8065b3fe 100644 (file)
@@ -5,6 +5,8 @@
 
 #include <linux/log2.h>
 
+#include "gem/i915_gem_internal.h"
+
 #include "gen6_ppgtt.h"
 #include "i915_scatterlist.h"
 #include "i915_trace.h"
index 84ad09fb9b8b8427d8763ddcf82364e3255ea426..3922dcf4a6ae151a0bfb6ae9a5682edbc4e60770 100644 (file)
@@ -6,6 +6,7 @@
 #include <drm/drm_print.h>
 
 #include "gem/i915_gem_context.h"
+#include "gem/i915_gem_internal.h"
 #include "gt/intel_gt_regs.h"
 
 #include "i915_cmd_parser.h"
index 57763aede976a5c546a9b2291b0100f6112870f2..545a2b1f183491b1c7c6340d32f71786dc568070 100644 (file)
@@ -5,15 +5,17 @@
 
 #include <drm/intel-gtt.h>
 
-#include "intel_gt_debugfs.h"
-
+#include "gem/i915_gem_internal.h"
 #include "gem/i915_gem_lmem.h"
+#include "pxp/intel_pxp.h"
+
 #include "i915_drv.h"
 #include "intel_context.h"
 #include "intel_engine_regs.h"
 #include "intel_gt.h"
 #include "intel_gt_buffer_pool.h"
 #include "intel_gt_clock_utils.h"
+#include "intel_gt_debugfs.h"
 #include "intel_gt_pm.h"
 #include "intel_gt_regs.h"
 #include "intel_gt_requests.h"
@@ -25,7 +27,6 @@
 #include "intel_rps.h"
 #include "intel_uncore.h"
 #include "shmem_utils.h"
-#include "pxp/intel_pxp.h"
 
 void __intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915)
 {
index 9db3dcbd917f7f5a4be97db96d474c69d892a45a..cadfd85785b12870430c16fedcd7d5ddc0e8f71b 100644 (file)
@@ -3,6 +3,7 @@
  * Copyright © 2014-2018 Intel Corporation
  */
 
+#include "gem/i915_gem_internal.h"
 #include "gem/i915_gem_object.h"
 
 #include "i915_drv.h"
index b5d3cde08aac19d7555a3d48be78f35dde61d49e..8506db9983da2f3cb199d14b65a55c623ba65b5f 100644 (file)
@@ -10,6 +10,7 @@
 
 #include <drm/drm_cache.h>
 
+#include "gem/i915_gem_internal.h"
 #include "gem/i915_gem_lmem.h"
 #include "i915_trace.h"
 #include "intel_gt.h"
index b575cd6e0b7a8aa23545b8b84429f718cf4f7563..5121e6dc2fa53eecae78ca176d1ca3aa5c0d63d8 100644 (file)
@@ -3,6 +3,8 @@
  * Copyright © 2014 Intel Corporation
  */
 
+#include "gem/i915_gem_internal.h"
+
 #include "i915_drv.h"
 #include "intel_renderstate.h"
 #include "intel_context.h"
index 723055340c9bc191ee8aa10ebb178e3c0093ea72..40ffcb94e3797c295347f2d0f24faed65b2664d3 100644 (file)
@@ -3,6 +3,7 @@
  * Copyright © 2019 Intel Corporation
  */
 
+#include "gem/i915_gem_internal.h"
 #include "gem/i915_gem_lmem.h"
 #include "gem/i915_gem_object.h"
 
index 8362eb09092e1afc1abcf6dd83906f7a961486fb..b128ccd2fb98d565e6005d30918c187c40328268 100644 (file)
@@ -3,6 +3,8 @@
  * Copyright © 2008-2021 Intel Corporation
  */
 
+#include "gem/i915_gem_internal.h"
+
 #include "gen2_engine_cs.h"
 #include "gen6_engine_cs.h"
 #include "gen6_ppgtt.h"
index 438bbc7b8147435bb4c2e4aee13d954182651061..2962be6d4d0036e3b6a7c9ef5e20d41ad24f908c 100644 (file)
@@ -3,9 +3,10 @@
  * Copyright © 2016-2018 Intel Corporation
  */
 
-#include "i915_drv.h"
+#include "gem/i915_gem_internal.h"
 
 #include "i915_active.h"
+#include "i915_drv.h"
 #include "i915_syncmap.h"
 #include "intel_gt.h"
 #include "intel_ring.h"
index e10da897e07a419cc2ea4e6dcbd89e8a8a44a67c..72d5faab8f9a5581ad696dfc1fc0f5fd3f0244ad 100644 (file)
@@ -5,6 +5,7 @@
 
 #include <linux/prime_numbers.h>
 
+#include "gem/i915_gem_internal.h"
 #include "gem/i915_gem_pm.h"
 #include "gt/intel_engine_heartbeat.h"
 #include "gt/intel_reset.h"
index 4a20ba63446c5acb7d399e6868dbc1400f0984ef..9e9ccb139ba71b285c9de0c76c52b5428eff9dae 100644 (file)
@@ -6,6 +6,7 @@
 #include <linux/kthread.h>
 
 #include "gem/i915_gem_context.h"
+#include "gem/i915_gem_internal.h"
 
 #include "i915_gem_evict.h"
 #include "intel_gt.h"
index 618c905daa19c4c84ae890ed79ab17f7adf4a59b..21c29d315cc0b7de45985313f9c2e644b5b24df1 100644 (file)
@@ -5,6 +5,8 @@
 
 #include <linux/prime_numbers.h>
 
+#include "gem/i915_gem_internal.h"
+
 #include "i915_selftest.h"
 #include "intel_engine_heartbeat.h"
 #include "intel_engine_pm.h"
index fa4293d2944f1a8e891810f0c885980cdae75960..c9c4f391c5cc0ae714c143772280a680f9f2daf8 100644 (file)
@@ -5,6 +5,8 @@
 
 #include <linux/sort.h>
 
+#include "gem/i915_gem_internal.h"
+
 #include "selftests/i915_random.h"
 
 static const unsigned int sizes[] = {
index e1e5dd5f7638a1d2ae8a3f3750c9381bc285c5a4..6a69ac0184ad8cf5514b4f64e93a7a84a76f6acb 100644 (file)
@@ -6,6 +6,8 @@
 #include <linux/pm_qos.h>
 #include <linux/sort.h>
 
+#include "gem/i915_gem_internal.h"
+
 #include "intel_engine_heartbeat.h"
 #include "intel_engine_pm.h"
 #include "intel_engine_regs.h"
index 0287c2573c51bc03750380f5cba1abebe741e78a..67a9aab801ddf1ac5e2cfca3281808be2dbb7fa5 100644 (file)
@@ -3,6 +3,7 @@
  * Copyright © 2018 Intel Corporation
  */
 
+#include "gem/i915_gem_internal.h"
 #include "gem/i915_gem_pm.h"
 #include "gt/intel_engine_user.h"
 #include "gt/intel_gt.h"
index 78fa3340101b6f553bf01219d52f31df6ade406b..6f6e8f1e1978cdc5dd5a52a27a06d15b810f501a 100644 (file)
@@ -1647,15 +1647,6 @@ i915_gem_vm_lookup(struct drm_i915_file_private *file_priv, u32 id)
        return vm;
 }
 
-/* i915_gem_internal.c */
-struct drm_i915_gem_object *
-i915_gem_object_create_internal(struct drm_i915_private *dev_priv,
-                               phys_addr_t size);
-struct drm_i915_gem_object *
-__i915_gem_object_create_internal(struct drm_i915_private *dev_priv,
-                                 const struct drm_i915_gem_object_ops *ops,
-                                 phys_addr_t size);
-
 /* i915_gem_tiling.c */
 static inline bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_object *obj)
 {
index 590efdb9de8db83e391aeb7bc408e624daffb2cb..09f7cf7bbc457c009e51508d0c778b02ef365586 100644 (file)
 #include <linux/uuid.h>
 
 #include "gem/i915_gem_context.h"
+#include "gem/i915_gem_internal.h"
 #include "gt/intel_engine_pm.h"
 #include "gt/intel_engine_regs.h"
 #include "gt/intel_engine_user.h"
index b5576888cd78e3fcd87ea1de5551398253eaadcd..6a7328d9c3614dffeab57603f9fbbd4898e6da8c 100644 (file)
@@ -6,9 +6,10 @@
 
 #include <linux/random.h>
 
+#include "gem/i915_gem_internal.h"
+#include "gem/i915_gem_pm.h"
 #include "gem/selftests/igt_gem_utils.h"
 #include "gem/selftests/mock_context.h"
-#include "gem/i915_gem_pm.h"
 #include "gt/intel_gt.h"
 #include "gt/intel_gt_pm.h"
 
index 75b709c26dd3c7c1803275e9f22ebb7c9aba88a5..74a1b2ecf48f94f47a5e3a16c3fdb4e40a876aa0 100644 (file)
@@ -22,6 +22,7 @@
  *
  */
 
+#include "gem/i915_gem_internal.h"
 #include "gem/i915_gem_pm.h"
 #include "gem/selftests/igt_gem_utils.h"
 #include "gem/selftests/mock_context.h"
index 575705c3bce9ad0373bf9c6252b76a65c4241034..1b508c89468c18890d4d2d902fc19c8f9c3dbb3d 100644 (file)
@@ -26,6 +26,7 @@
 #include <linux/prime_numbers.h>
 
 #include "gem/i915_gem_context.h"
+#include "gem/i915_gem_internal.h"
 #include "gem/selftests/mock_context.h"
 #include "gt/intel_context.h"
 #include "gt/intel_gpu_commands.h"
index 92a859b341904939c4d697f78b04698ef51b2d83..3e673fd1ea4ff7d3da150ffea9fc679f08474c7b 100644 (file)
@@ -26,6 +26,7 @@
 #include <linux/pm_qos.h>
 #include <linux/sort.h>
 
+#include "gem/i915_gem_internal.h"
 #include "gem/i915_gem_pm.h"
 #include "gem/selftests/mock_context.h"
 
index 5c5809dfe9b254bb08f9d66c9b478fbf802d731f..cc6f9af679fb12c92e34d9cef4675109350de17e 100644 (file)
@@ -25,6 +25,7 @@
 #include <linux/prime_numbers.h>
 
 #include "gem/i915_gem_context.h"
+#include "gem/i915_gem_internal.h"
 #include "gem/selftests/mock_context.h"
 
 #include "i915_scatterlist.h"
index 24d87d0fc747e0413c5edc3a239069d326100116..0c22594ae274694b6e9226d9d8a246783728a176 100644 (file)
@@ -6,6 +6,7 @@
 #include "gt/intel_gpu_commands.h"
 #include "gt/intel_gt.h"
 
+#include "gem/i915_gem_internal.h"
 #include "gem/selftests/igt_gem_utils.h"
 
 #include "igt_spinner.h"