leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915: split out i915_gem_internal.h from i915_drv.h

Browse Source 
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
This commit is contained in:
Jani Nikula 2022-02-10 17:45:39 +02:00
parent 420f63cb6d
commit b508d01fa5
31 changed files with 67 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/display/intel_dsb.c
View File

@ -4,6 +4,8 @@
*
*/
#include "gem/i915_gem_internal.h"
#include "i915_drv.h"
#include "intel_de.h"
#include "intel_display_types.h"

1
drivers/gpu/drm/i915/display/intel_overlay.c
View 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"

1
drivers/gpu/drm/i915/gem/i915_gem_internal.c
View 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"

23
drivers/gpu/drm/i915/gem/i915_gem_internal.h Normal file
View File

@ -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__ */

3
drivers/gpu/drm/i915/gem/selftests/huge_pages.c
View 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"

1
drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
View 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"

4
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
View 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"

1
drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c
View 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"

2
drivers/gpu/drm/i915/gt/gen6_ppgtt.c
View 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"

1
drivers/gpu/drm/i915/gt/intel_engine_cs.c
View 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"

7
drivers/gpu/drm/i915/gt/intel_gt.c
View 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)
{

1
drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c
View 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"

1
drivers/gpu/drm/i915/gt/intel_gtt.c
View 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"

2
drivers/gpu/drm/i915/gt/intel_renderstate.c
View 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"

1
drivers/gpu/drm/i915/gt/intel_ring.c
View 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"

2
drivers/gpu/drm/i915/gt/intel_ring_submission.c
View 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"

3
drivers/gpu/drm/i915/gt/intel_timeline.c
View 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"

1
drivers/gpu/drm/i915/gt/selftest_execlists.c
View 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"

1
drivers/gpu/drm/i915/gt/selftest_hangcheck.c
View 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"

2
drivers/gpu/drm/i915/gt/selftest_lrc.c
View 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"

2
drivers/gpu/drm/i915/gt/selftest_migrate.c
View 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[] = {

2
drivers/gpu/drm/i915/gt/selftest_rps.c
View 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"

1
drivers/gpu/drm/i915/gt/selftest_workarounds.c
View 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"

9
drivers/gpu/drm/i915/i915_drv.h
View 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)
{

1
drivers/gpu/drm/i915/i915_perf.c
View File

@ -196,6 +196,7 @@
#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"

3
drivers/gpu/drm/i915/selftests/i915_gem.c
View 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"

1
drivers/gpu/drm/i915/selftests/i915_gem_evict.c
View 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"

1
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
View 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"

1
drivers/gpu/drm/i915/selftests/i915_request.c
View 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"

1
drivers/gpu/drm/i915/selftests/i915_vma.c
View 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"

1
drivers/gpu/drm/i915/selftests/igt_spinner.c
View 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"