tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915: split out i915_gem_internal.h from i915_drv.h
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
+67
-16
+2
drivers/gpu/drm/i915/display/intel_dsb.c
+2
drivers/gpu/drm/i915/display/intel_dsb.c
+1
drivers/gpu/drm/i915/display/intel_overlay.c
+1
drivers/gpu/drm/i915/display/intel_overlay.c
+1
drivers/gpu/drm/i915/gem/i915_gem_internal.c
+1
drivers/gpu/drm/i915/gem/i915_gem_internal.c
+23
drivers/gpu/drm/i915/gem/i915_gem_internal.h
+23
drivers/gpu/drm/i915/gem/i915_gem_internal.h
···
1
+
/* SPDX-License-Identifier: MIT */
2
+
/*
3
+
* Copyright © 2022 Intel Corporation
4
+
*/
5
+
6
+
#ifndef __I915_GEM_INTERNAL_H__
7
+
#define __I915_GEM_INTERNAL_H__
8
+
9
+
#include <linux/types.h>
10
+
11
+
struct drm_i915_gem_object;
12
+
struct drm_i915_gem_object_ops;
13
+
struct drm_i915_private;
14
+
15
+
struct drm_i915_gem_object *
16
+
i915_gem_object_create_internal(struct drm_i915_private *i915,
17
+
phys_addr_t size);
18
+
struct drm_i915_gem_object *
19
+
__i915_gem_object_create_internal(struct drm_i915_private *i915,
20
+
const struct drm_i915_gem_object_ops *ops,
21
+
phys_addr_t size);
22
+
23
+
#endif /* __I915_GEM_INTERNAL_H__ */
+2
-1
drivers/gpu/drm/i915/gem/selftests/huge_pages.c
+2
-1
drivers/gpu/drm/i915/gem/selftests/huge_pages.c
+1
drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
+1
drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
+3
-1
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
+3
-1
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
···
6
6
7
7
#include <linux/prime_numbers.h>
8
8
9
+
#include "gem/i915_gem_internal.h"
10
+
#include "gem/i915_gem_region.h"
9
11
#include "gt/intel_engine_pm.h"
10
12
#include "gt/intel_gpu_commands.h"
11
13
#include "gt/intel_gt.h"
12
14
#include "gt/intel_gt_pm.h"
13
-
#include "gem/i915_gem_region.h"
15
+
14
16
#include "huge_gem_object.h"
15
17
#include "i915_selftest.h"
16
18
#include "selftests/i915_random.h"
+1
drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c
+1
drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c
+2
drivers/gpu/drm/i915/gt/gen6_ppgtt.c
+2
drivers/gpu/drm/i915/gt/gen6_ppgtt.c
+1
drivers/gpu/drm/i915/gt/intel_engine_cs.c
+1
drivers/gpu/drm/i915/gt/intel_engine_cs.c
+4
-3
drivers/gpu/drm/i915/gt/intel_gt.c
+4
-3
drivers/gpu/drm/i915/gt/intel_gt.c
···
5
5
6
6
#include <drm/intel-gtt.h>
7
7
8
-
#include "intel_gt_debugfs.h"
9
-
8
+
#include "gem/i915_gem_internal.h"
10
9
#include "gem/i915_gem_lmem.h"
10
+
#include "pxp/intel_pxp.h"
11
+
11
12
#include "i915_drv.h"
12
13
#include "intel_context.h"
13
14
#include "intel_engine_regs.h"
14
15
#include "intel_gt.h"
15
16
#include "intel_gt_buffer_pool.h"
16
17
#include "intel_gt_clock_utils.h"
18
+
#include "intel_gt_debugfs.h"
17
19
#include "intel_gt_pm.h"
18
20
#include "intel_gt_regs.h"
19
21
#include "intel_gt_requests.h"
···
27
25
#include "intel_rps.h"
28
26
#include "intel_uncore.h"
29
27
#include "shmem_utils.h"
30
-
#include "pxp/intel_pxp.h"
31
28
32
29
void __intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915)
33
30
{
+1
drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c
+1
drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c
+1
drivers/gpu/drm/i915/gt/intel_gtt.c
+1
drivers/gpu/drm/i915/gt/intel_gtt.c
+2
drivers/gpu/drm/i915/gt/intel_renderstate.c
+2
drivers/gpu/drm/i915/gt/intel_renderstate.c
+1
drivers/gpu/drm/i915/gt/intel_ring.c
+1
drivers/gpu/drm/i915/gt/intel_ring.c
+2
drivers/gpu/drm/i915/gt/intel_ring_submission.c
+2
drivers/gpu/drm/i915/gt/intel_ring_submission.c
+2
-1
drivers/gpu/drm/i915/gt/intel_timeline.c
+2
-1
drivers/gpu/drm/i915/gt/intel_timeline.c
+1
drivers/gpu/drm/i915/gt/selftest_execlists.c
+1
drivers/gpu/drm/i915/gt/selftest_execlists.c
+1
drivers/gpu/drm/i915/gt/selftest_hangcheck.c
+1
drivers/gpu/drm/i915/gt/selftest_hangcheck.c
+2
drivers/gpu/drm/i915/gt/selftest_lrc.c
+2
drivers/gpu/drm/i915/gt/selftest_lrc.c
+2
drivers/gpu/drm/i915/gt/selftest_migrate.c
+2
drivers/gpu/drm/i915/gt/selftest_migrate.c
+2
drivers/gpu/drm/i915/gt/selftest_rps.c
+2
drivers/gpu/drm/i915/gt/selftest_rps.c
+1
drivers/gpu/drm/i915/gt/selftest_workarounds.c
+1
drivers/gpu/drm/i915/gt/selftest_workarounds.c
-9
drivers/gpu/drm/i915/i915_drv.h
-9
drivers/gpu/drm/i915/i915_drv.h
···
1647
1647
return vm;
1648
1648
}
1649
1649
1650
-
/* i915_gem_internal.c */
1651
-
struct drm_i915_gem_object *
1652
-
i915_gem_object_create_internal(struct drm_i915_private *dev_priv,
1653
-
phys_addr_t size);
1654
-
struct drm_i915_gem_object *
1655
-
__i915_gem_object_create_internal(struct drm_i915_private *dev_priv,
1656
-
const struct drm_i915_gem_object_ops *ops,
1657
-
phys_addr_t size);
1658
-
1659
1650
/* i915_gem_tiling.c */
1660
1651
static inline bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_object *obj)
1661
1652
{
+1
drivers/gpu/drm/i915/i915_perf.c
+1
drivers/gpu/drm/i915/i915_perf.c
+2
-1
drivers/gpu/drm/i915/selftests/i915_gem.c
+2
-1
drivers/gpu/drm/i915/selftests/i915_gem.c
···
6
6
7
7
#include <linux/random.h>
8
8
9
+
#include "gem/i915_gem_internal.h"
10
+
#include "gem/i915_gem_pm.h"
9
11
#include "gem/selftests/igt_gem_utils.h"
10
12
#include "gem/selftests/mock_context.h"
11
-
#include "gem/i915_gem_pm.h"
12
13
#include "gt/intel_gt.h"
13
14
#include "gt/intel_gt_pm.h"
14
15
+1
drivers/gpu/drm/i915/selftests/i915_gem_evict.c
+1
drivers/gpu/drm/i915/selftests/i915_gem_evict.c
+1
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
+1
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
+1
drivers/gpu/drm/i915/selftests/i915_request.c
+1
drivers/gpu/drm/i915/selftests/i915_request.c
+1
drivers/gpu/drm/i915/selftests/i915_vma.c
+1
drivers/gpu/drm/i915/selftests/i915_vma.c