drm/i915: clean up i915_drv.h
Subsystems (4)
cover drm/i915: clean up i915_drv.h
In a long overdue cleanup, split out a bunch of headers and declarations out of i915_drv.h, and reduce includes all over the place.
I feel pretty strongly that declarations for functions in some_file.c need to be placed in some_file.h. This does not generally seem to be the case in gem/gt land. I create a number of such files here to place the declarations extracted from i915_drv.h in them. I limit myself to i915_drv.h cleanup here, and leave further cleanup for follow-up.
i915_drv.h is a painful file to deal with. Due to the massive amount of headers it includes, and the massive amount of files it gets included from, it basically causes the entire driver to be rebuilt whenever almost any header gets changed in include/linux, include/drm, or i915 itself. Just build and sparse testing each commit takes eons.
This series is far from fixing everything, but it moves things forward a few strides.
BR,
Jani.
Jani Nikula (21):
drm/i915: split out i915_getparam.h from i915_drv.h drm/i915: split out i915_cmd_parser.h from i915_drv.h drm/i915: split out i915_gem_evict.h from i915_drv.h drm/i915: split out gem/i915_gem_userptr.h from i915_drv.h drm/i915: split out gem/i915_gem_tiling.h from i915_drv.h drm/i915: split out i915_gem.h declarations from i915_drv.h drm/i915: split out i915_gem_internal.h from i915_drv.h drm/i915: remove leftover i915_gem_pm.h declarations from i915_drv.h drm/i915: split out gem/i915_gem_dmabuf.h from i915_drv.h drm/i915: split out gem/i915_gem_create.h from i915_drv.h drm/i915: split out gem/i915_gem_domain.h from i915_drv.h drm/i915: move i915_cache_level_str() static in i915_debugfs.c drm/i915: move i915_gem_vm_lookup() where it's used drm/i915: move i915_reset_count()/i915_reset_engine_count() out of
i915_drv.h
drm/i915: split out i915_file_private.h from i915_drv.h drm/i915: don't include drm_cache.h in i915_drv.h drm/i915: include shmem_fs.h only where needed drm/i915: include some drm headers only where needed drm/i915: axe lots of unnecessary includes from i915_drv.h drm/i915: fix drm_i915.h include grouping and sorting drm/i915: group drm_i915.h forward declarations together
drivers/gpu/drm/i915/display/intel_dpt.c | 4 +- drivers/gpu/drm/i915/display/intel_dsb.c | 2 + drivers/gpu/drm/i915/display/intel_fb_pin.c | 1 + drivers/gpu/drm/i915/display/intel_overlay.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 2 + drivers/gpu/drm/i915/gem/i915_gem_context.c | 17 + drivers/gpu/drm/i915/gem/i915_gem_create.c | 3 + drivers/gpu/drm/i915/gem/i915_gem_create.h | 17 + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.h | 18 ++ drivers/gpu/drm/i915/gem/i915_gem_domain.c | 5 +- drivers/gpu/drm/i915/gem/i915_gem_domain.h | 15 + .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 3 + drivers/gpu/drm/i915/gem/i915_gem_internal.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_internal.h | 23 ++ drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 + drivers/gpu/drm/i915/gem/i915_gem_object.c | 5 + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 2 + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 3 + drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_tiling.h | 18 ++ drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_userptr.h | 14 + .../gpu/drm/i915/gem/selftests/huge_pages.c | 3 +- .../drm/i915/gem/selftests/i915_gem_context.c | 1 + .../drm/i915/gem/selftests/i915_gem_mman.c | 4 +- .../drm/i915/gem/selftests/igt_gem_utils.c | 1 + .../gpu/drm/i915/gem/selftests/mock_context.c | 1 + drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 2 + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 14 +- drivers/gpu/drm/i915/gt/intel_gt.c | 7 +- .../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_renderstate.c | 2 + drivers/gpu/drm/i915/gt/intel_reset.c | 1 + drivers/gpu/drm/i915/gt/intel_ring.c | 1 + .../gpu/drm/i915/gt/intel_ring_submission.c | 4 + drivers/gpu/drm/i915/gt/intel_timeline.c | 5 +- drivers/gpu/drm/i915/gt/selftest_execlists.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_migrate.c | 2 + drivers/gpu/drm/i915/gt/selftest_rps.c | 2 + .../gpu/drm/i915/gt/selftest_workarounds.c | 1 + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 2 + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 + drivers/gpu/drm/i915/gvt/dmabuf.c | 5 + drivers/gpu/drm/i915/i915_cmd_parser.c | 3 + drivers/gpu/drm/i915/i915_cmd_parser.h | 26 ++ drivers/gpu/drm/i915/i915_debugfs.c | 11 + drivers/gpu/drm/i915/i915_driver.c | 4 + drivers/gpu/drm/i915/i915_drv.h | 297 ++---------------- drivers/gpu/drm/i915/i915_file_private.h | 108 +++++++ drivers/gpu/drm/i915/i915_gem.c | 8 +- drivers/gpu/drm/i915/i915_gem.h | 36 +++ drivers/gpu/drm/i915/i915_gem_evict.c | 1 + drivers/gpu/drm/i915/i915_gem_evict.h | 24 ++ drivers/gpu/drm/i915/i915_gem_gtt.c | 1 + drivers/gpu/drm/i915/i915_getparam.c | 2 + drivers/gpu/drm/i915/i915_getparam.h | 15 + drivers/gpu/drm/i915/i915_gpu_error.c | 1 + drivers/gpu/drm/i915/i915_gpu_error.h | 11 + drivers/gpu/drm/i915/i915_ioc32.c | 1 + drivers/gpu/drm/i915/i915_pci.c | 1 + drivers/gpu/drm/i915/i915_perf.c | 2 + drivers/gpu/drm/i915/i915_vma.c | 3 +- drivers/gpu/drm/i915/selftests/i915_gem.c | 3 +- .../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_request.c | 1 + drivers/gpu/drm/i915/selftests/i915_vma.c | 1 + drivers/gpu/drm/i915/selftests/igt_spinner.c | 1 + 74 files changed, 498 insertions(+), 294 deletions(-) create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_create.h create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_dmabuf.h create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_domain.h create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_internal.h create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_tiling.h create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_userptr.h create mode 100644 drivers/gpu/drm/i915/i915_cmd_parser.h create mode 100644 drivers/gpu/drm/i915/i915_file_private.h create mode 100644 drivers/gpu/drm/i915/i915_gem_evict.h create mode 100644 drivers/gpu/drm/i915/i915_getparam.h
Signature · 1 line
2.30.2
PATCH 1/21 drm/i915: split out i915_getparam.h from i915_drv.h
We already have the i915_getparam.c file.
--- drivers/gpu/drm/i915/i915_driver.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 4 ---- drivers/gpu/drm/i915/i915_getparam.c | 1 + drivers/gpu/drm/i915/i915_getparam.h | 15 +++++++++++++++ drivers/gpu/drm/i915/i915_ioc32.c | 1 + 5 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_getparam.h
drivers/gpu/drm/i915/i915_driver.c +1 -0
@@ -74,6 +74,7 @@#include "i915_debugfs.h" #include "i915_driver.h" #include "i915_drv.h" +#include "i915_getparam.h" #include "i915_ioc32.h" #include "i915_irq.h" #include "i915_memcpy.h"
drivers/gpu/drm/i915/i915_drv.h +0 -4
@@ -1604,10 +1604,6 @@ intel_vm_no_concurrent_access_wa(struct drm_i915_private *i915)return IS_CHERRYVIEW (i915) ||intel_ggtt_update_needs_vtd_wa (i915); } -/* i915_getparam.c */ -int i915_getparam_ioctl (struct drm_device *dev,void *data, -struct drm_file *file_priv); -/* 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);
drivers/gpu/drm/i915/i915_getparam.c +1 -0
@@ -6,6 +6,7 @@#include "gt/intel_engine_user.h" #include "i915_drv.h" +#include "i915_getparam.h" #include "i915_perf.h" int i915_getparam_ioctl(struct drm_device *dev, void *data,
drivers/gpu/drm/i915/i915_getparam.h new file +15 -0
@@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2021 Intel Corporation +*/ + +#ifndef __I915_GETPARAM_H__ +#define __I915_GETPARAM_H__ + +struct drm_device ; +struct drm_file ; + +int i915_getparam_ioctl (struct drm_device *dev,void *data, +struct drm_file *file_priv); + +#endif /* __I915_GETPARAM_H__ */
drivers/gpu/drm/i915/i915_ioc32.c +1 -0
@@ -31,6 +31,7 @@#include <drm/drm_ioctl.h> #include "i915_drv.h" +#include "i915_getparam.h" #include "i915_ioc32.h" struct drm_i915_getparam32 {
Signature · 1 line
2.30.2
PATCH 3/21 drm/i915: split out i915_gem_evict.h from i915_drv.h
In reply to Jani NikulaWe already have the i915_gem_evicti915.c file.
--- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 1 + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 11 --------- drivers/gpu/drm/i915/i915_gem_evict.c | 1 + drivers/gpu/drm/i915/i915_gem_evict.h | 24 +++++++++++++++++++ drivers/gpu/drm/i915/i915_gem_gtt.c | 1 + drivers/gpu/drm/i915/i915_vma.c | 1 + 7 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_gem_evict.h
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +1 -0
@@ -27,6 +27,7 @@#include "i915_drv.h" #include "i915_gem_clflush.h" #include "i915_gem_context.h" +#include "i915_gem_evict.h" #include "i915_gem_ioctls.h" #include "i915_trace.h" #include "i915_user_extensions.h"
drivers/gpu/drm/i915/gt/selftest_hangcheck.c +1 -0
@@ -7,6 +7,7 @@#include "gem/i915_gem_context.h" +#include "i915_gem_evict.h" #include "intel_gt.h" #include "intel_engine_heartbeat.h" #include "intel_engine_pm.h"
drivers/gpu/drm/i915/i915_drv.h +0 -11
@@ -1718,17 +1718,6 @@ i915_gem_vm_lookup(struct drm_i915_file_private *file_priv, u32 id)return vm; } -/* i915_gem_evict.c */ -int __must_check i915_gem_evict_something (struct i915_address_space *vm, -u64 min_size,u64 alignment, -unsigned long color, -u64 start,u64 end, -unsigned flags); -int __must_check i915_gem_evict_for_node (struct i915_address_space *vm, -struct drm_mm_node *node, -unsigned int flags); -int i915_gem_evict_vm (struct i915_address_space *vm); -/* i915_gem_internal.c */ struct drm_i915_gem_object * i915_gem_object_create_internal(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/i915_gem_evict.c +1 -0
@@ -31,6 +31,7 @@#include "gt/intel_gt_requests.h" #include "i915_drv.h" +#include "i915_gem_evict.h" #include "i915_trace.h" I915_SELFTEST_DECLARE(static struct igt_evict_ctl {
drivers/gpu/drm/i915/i915_gem_evict.h new file +24 -0
@@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2021 Intel Corporation +*/ + +#ifndef __I915_GEM_EVICT_H__ +#define __I915_GEM_EVICT_H__ + +#include <linux/types.h> + +struct drm_mm_node ; +struct i915_address_space ; + +int __must_check i915_gem_evict_something (struct i915_address_space *vm, +u64 min_size,u64 alignment, +unsigned long color, +u64 start,u64 end, +unsigned flags); +int __must_check i915_gem_evict_for_node (struct i915_address_space *vm, +struct drm_mm_node *node, +unsigned int flags); +int i915_gem_evict_vm (struct i915_address_space *vm); + +#endif /* __I915_GEM_EVICT_H__ */
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -0
@@ -20,6 +20,7 @@#include "gt/intel_gt_requests.h" #include "i915_drv.h" +#include "i915_gem_evict.h" #include "i915_scatterlist.h" #include "i915_trace.h" #include "i915_vgpu.h"
drivers/gpu/drm/i915/i915_vma.c +1 -0
@@ -34,6 +34,7 @@#include "gt/intel_gt_requests.h" #include "i915_drv.h" +#include "i915_gem_evict.h" #include "i915_sw_fence_work.h" #include "i915_trace.h" #include "i915_vma.h"
Signature · 1 line
2.30.2
PATCH 4/21 drm/i915: split out gem/i915_gem_userptr.h from i915_drv.h
In reply to Jani NikulaWe already have the gem/i915_gem_userptr.c file.
--- 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
drivers/gpu/drm/i915/gem/i915_gem_userptr.c +1 -0
@@ -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
drivers/gpu/drm/i915/gem/i915_gem_userptr.h new file +14 -0
@@ -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__ */
drivers/gpu/drm/i915/i915_drv.h +0 -2
@@ -1605,8 +1605,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);
drivers/gpu/drm/i915/i915_gem.c +1 -0
@@ -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"
Signature · 1 line
2.30.2
PATCH 5/21 drm/i915: split out gem/i915_gem_tiling.h from i915_drv.h
In reply to Jani NikulaWe already have the gem/i915_gem_tiling.c file.
--- drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_tiling.h | 18 ++++++++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 5 ----- drivers/gpu/drm/i915/i915_vma.c | 2 +- 4 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_tiling.h
drivers/gpu/drm/i915/gem/i915_gem_tiling.c +1 -0
@@ -12,6 +12,7 @@#include "i915_gem_ioctls.h" #include "i915_gem_mman.h" #include "i915_gem_object.h" +#include "i915_gem_tiling.h" /** * DOC: buffer object tiling
drivers/gpu/drm/i915/gem/i915_gem_tiling.h new file +18 -0
@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2022 Intel Corporation +*/ + +#ifndef __I915_GEM_TILING_H__ +#define __I915_GEM_TILING_H__ + +#include <linux/types.h> + +struct drm_i915_private ; + +u32 i915_gem_fence_size (struct drm_i915_private *i915,u32 size, +unsigned int tiling,unsigned int stride); +u32 i915_gem_fence_alignment (struct drm_i915_private *i915,u32 size, +unsigned int tiling,unsigned int stride); + +#endif /* __I915_GEM_TILING_H__ */
drivers/gpu/drm/i915/i915_drv.h +0 -5
@@ -1734,11 +1734,6 @@ static inline bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_objeci915_gem_object_is_tiled (obj); } -u32 i915_gem_fence_size (struct drm_i915_private *dev_priv,u32 size, -unsigned int tiling,unsigned int stride); -u32 i915_gem_fence_alignment (struct drm_i915_private *dev_priv,u32 size, -unsigned int tiling,unsigned int stride); -const char *i915_cache_level_str (struct drm_i915_private *i915,int type);/* intel_device_info.c */
drivers/gpu/drm/i915/i915_vma.c +1 -1
@@ -26,8 +26,8 @@#include <drm/drm_gem.h> #include "display/intel_frontbuffer.h" -#include "gem/i915_gem_lmem.h" +#include "gem/i915_gem_tiling.h" #include "gt/intel_engine.h" #include "gt/intel_engine_heartbeat.h" #include "gt/intel_gt.h"
Signature · 1 line
2.30.2
PATCH 2/21 drm/i915: split out i915_cmd_parser.h from i915_drv.h
In reply to Jani NikulaWe already have the i915_cmd_parser.c file.
--- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 1 + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/i915_cmd_parser.c | 1 + drivers/gpu/drm/i915/i915_cmd_parser.h | 26 +++++++++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 12 --------- drivers/gpu/drm/i915/i915_getparam.c | 1 + 6 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_cmd_parser.h
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +1 -0
@@ -23,6 +23,7 @@#include "pxp/intel_pxp.h" +#include "i915_cmd_parser.h" #include "i915_drv.h" #include "i915_gem_clflush.h" #include "i915_gem_context.h"
drivers/gpu/drm/i915/gt/intel_engine_cs.c +1 -1
@@ -7,8 +7,8 @@#include "gem/i915_gem_context.h" +#include "i915_cmd_parser.h" #include "i915_drv.h" -#include "intel_breadcrumbs.h" #include "intel_context.h" #include "intel_engine.h"
drivers/gpu/drm/i915/i915_cmd_parser.c +1 -0
@@ -28,6 +28,7 @@#include "gt/intel_engine.h" #include "gt/intel_gpu_commands.h" +#include "i915_cmd_parser.h" #include "i915_drv.h" #include "i915_memcpy.h"
drivers/gpu/drm/i915/i915_cmd_parser.h new file +26 -0
@@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2021 Intel Corporation +*/ + +#ifndef __I915_CMD_PARSER_H__ +#define __I915_CMD_PARSER_H__ + +#include <linux/types.h> + +struct drm_i915_private ; +struct intel_engine_cs ; +struct i915_vma ; + +int i915_cmd_parser_get_version (struct drm_i915_private *dev_priv); +int intel_engine_init_cmd_parser (struct intel_engine_cs *engine); +void intel_engine_cleanup_cmd_parser (struct intel_engine_cs *engine); +int intel_engine_cmd_parser (struct intel_engine_cs *engine, +struct i915_vma *batch, +unsigned long batch_offset, +unsigned long batch_length, +struct i915_vma *shadow, +bool trampoline); +#define I915_CMD_PARSER_TRAMPOLINE_SIZE 8 + +#endif /* __I915_CMD_PARSER_H__ */
drivers/gpu/drm/i915/i915_drv.h +0 -12
@@ -1754,18 +1754,6 @@ u32 i915_gem_fence_alignment(struct drm_i915_private *dev_priv, u32 size,const char *i915_cache_level_str (struct drm_i915_private *i915,int type); -/* i915_cmd_parser.c */ -int i915_cmd_parser_get_version (struct drm_i915_private *dev_priv); -int intel_engine_init_cmd_parser (struct intel_engine_cs *engine); -void intel_engine_cleanup_cmd_parser (struct intel_engine_cs *engine); -int intel_engine_cmd_parser (struct intel_engine_cs *engine, -struct i915_vma *batch, -unsigned long batch_offset, -unsigned long batch_length, -struct i915_vma *shadow, -bool trampoline); -#define I915_CMD_PARSER_TRAMPOLINE_SIZE 8 -/* intel_device_info.c */ static inline struct intel_device_info *mkwrite_device_info (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_getparam.c +1 -0
@@ -5,6 +5,7 @@#include "gem/i915_gem_mman.h" #include "gt/intel_engine_user.h" +#include "i915_cmd_parser.h" #include "i915_drv.h" #include "i915_getparam.h" #include "i915_perf.h"
Signature · 1 line
2.30.2
PATCH 6/21 drm/i915: split out i915_gem.h declarations from i915_drv.h
In reply to Jani Nikulai915_gem.h should be the place for declarations for i915_gem.c, but looks like it's filled with all sorts of cruft. Even so, move the declarations where they belong.
--- drivers/gpu/drm/i915/i915_drv.h | 32 ----------------------------- drivers/gpu/drm/i915/i915_gem.h | 36 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 32 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -32
@@ -1605,9 +1605,6 @@ intel_vm_no_concurrent_access_wa(struct drm_i915_private *i915) }/* i915_gem.c */ -void i915_gem_init_early (struct drm_i915_private *dev_priv); -void i915_gem_cleanup_early (struct drm_i915_private *dev_priv); -static inline void i915_gem_drain_freed_objects (struct drm_i915_private *i915) {/*
@@ -1646,32 +1643,10 @@ static inline void i915_gem_drain_workqueue(struct drm_i915_private *i915)drain_workqueue (i915->wq); } -struct i915_vma *__must_check -i915_gem_object_ggtt_pin_ww (struct drm_i915_gem_object *obj, -struct i915_gem_ww_ctx *ww, -const struct i915_ggtt_view *view, -u64 size,u64 alignment,u64 flags); - -struct i915_vma *__must_check -i915_gem_object_ggtt_pin (struct drm_i915_gem_object *obj, -const struct i915_ggtt_view *view, -u64 size,u64 alignment,u64 flags); - -int i915_gem_object_unbind (struct drm_i915_gem_object *obj, -unsigned long flags); -#define I915_GEM_OBJECT_UNBIND_ACTIVE BIT(0) -#define I915_GEM_OBJECT_UNBIND_BARRIER BIT(1) -#define I915_GEM_OBJECT_UNBIND_TEST BIT(2) -#define I915_GEM_OBJECT_UNBIND_VM_TRYLOCK BIT(3) - -void i915_gem_runtime_suspend (struct drm_i915_private *dev_priv); -int i915_gem_dumb_create (struct drm_file *file_priv,struct drm_device *dev,struct drm_mode_create_dumb *args); -int __must_check i915_gem_set_global_seqno (struct drm_device *dev,u32 seqno); -static inline u32 i915_reset_count (struct i915_gpu_error *error) {return atomic_read (&error->reset_count);
@@ -1683,17 +1658,10 @@ static inline u32 i915_reset_engine_count(struct i915_gpu_error *error,return atomic_read (&error->reset_engine_count[engine->uabi_class]); } -int __must_check i915_gem_init (struct drm_i915_private *dev_priv); -void i915_gem_driver_register (struct drm_i915_private *i915); -void i915_gem_driver_unregister (struct drm_i915_private *i915); -void i915_gem_driver_remove (struct drm_i915_private *dev_priv); -void i915_gem_driver_release (struct drm_i915_private *dev_priv);void i915_gem_suspend (struct drm_i915_private *dev_priv);void i915_gem_suspend_late (struct drm_i915_private *dev_priv);void i915_gem_resume (struct drm_i915_private *dev_priv); -int i915_gem_open (struct drm_i915_private *i915,struct drm_file *file); -int i915_gem_object_set_cache_level (struct drm_i915_gem_object *obj,enum i915_cache_level cache_level);
drivers/gpu/drm/i915/i915_gem.h +36 -0
@@ -27,12 +27,18 @@#include <linux/bug.h> #include <linux/interrupt.h> +#include <linux/types.h> #include <drm/drm_drv.h> #include "i915_utils.h" +struct drm_file ; +struct drm_i915_gem_object ;struct drm_i915_private ; +struct i915_gem_ww_ctx ; +struct i915_ggtt_view ; +struct i915_vma ;#ifdef CONFIG_DRM_I915_DEBUG_GEM
@@ -123,4 +129,34 @@ static inline bool __tasklet_is_scheduled(struct tasklet_struct *t)return test_bit (TASKLET_STATE_SCHED , &t->state); } +void i915_gem_init_early (struct drm_i915_private *i915); +void i915_gem_cleanup_early (struct drm_i915_private *i915); +int __must_check i915_gem_init (struct drm_i915_private *i915); +void i915_gem_driver_register (struct drm_i915_private *i915); +void i915_gem_driver_unregister (struct drm_i915_private *i915); +void i915_gem_driver_remove (struct drm_i915_private *i915); +void i915_gem_driver_release (struct drm_i915_private *i915); +int i915_gem_open (struct drm_i915_private *i915,struct drm_file *file); + +void i915_gem_runtime_suspend (struct drm_i915_private *i915); + +struct i915_vma *__must_check +i915_gem_object_ggtt_pin_ww (struct drm_i915_gem_object *obj, +struct i915_gem_ww_ctx *ww, +const struct i915_ggtt_view *view, +u64 size,u64 alignment,u64 flags); + +struct i915_vma *__must_check +i915_gem_object_ggtt_pin (struct drm_i915_gem_object *obj, +const struct i915_ggtt_view *view, +u64 size,u64 alignment,u64 flags); + +#define I915_GEM_OBJECT_UNBIND_ACTIVE BIT(0) +#define I915_GEM_OBJECT_UNBIND_BARRIER BIT(1) +#define I915_GEM_OBJECT_UNBIND_TEST BIT(2) +#define I915_GEM_OBJECT_UNBIND_VM_TRYLOCK BIT(3) + +int i915_gem_object_unbind (struct drm_i915_gem_object *obj, +unsigned long flags); +#endif /* __I915_GEM_H__ */
Signature · 1 line
2.30.2
PATCH 7/21 drm/i915: split out i915_gem_internal.h from i915_drv.h
In reply to Jani NikulaWe already have the i915_gem_internal.c file.
--- drivers/gpu/drm/i915/display/intel_dsb.c | 2 ++ 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.h | 23 +++++++++++++++++++ .../gpu/drm/i915/gem/selftests/huge_pages.c | 3 ++- .../drm/i915/gem/selftests/i915_gem_context.c | 1 + .../drm/i915/gem/selftests/i915_gem_mman.c | 4 +++- .../drm/i915/gem/selftests/igt_gem_utils.c | 1 + drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 2 ++ drivers/gpu/drm/i915/gt/intel_engine_cs.c | 1 + drivers/gpu/drm/i915/gt/intel_gt.c | 7 +++--- .../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_renderstate.c | 2 ++ drivers/gpu/drm/i915/gt/intel_ring.c | 1 + .../gpu/drm/i915/gt/intel_ring_submission.c | 2 ++ drivers/gpu/drm/i915/gt/intel_timeline.c | 3 ++- drivers/gpu/drm/i915/gt/selftest_execlists.c | 1 + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 1 + drivers/gpu/drm/i915/gt/selftest_lrc.c | 2 ++ drivers/gpu/drm/i915/gt/selftest_migrate.c | 2 ++ drivers/gpu/drm/i915/gt/selftest_rps.c | 2 ++ .../gpu/drm/i915/gt/selftest_workarounds.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 9 -------- drivers/gpu/drm/i915/i915_perf.c | 1 + drivers/gpu/drm/i915/selftests/i915_gem.c | 3 ++- .../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_request.c | 1 + drivers/gpu/drm/i915/selftests/i915_vma.c | 1 + drivers/gpu/drm/i915/selftests/igt_spinner.c | 1 + 31 files changed, 67 insertions(+), 16 deletions(-) create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_internal.h
drivers/gpu/drm/i915/display/intel_dsb.c +2 -0
@@ -4,6 +4,8 @@* */ +#include "gem/i915_gem_internal.h" +#include "i915_drv.h" #include "intel_de.h" #include "intel_display_types.h"
drivers/gpu/drm/i915/display/intel_overlay.c +1 -0
@@ -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"
drivers/gpu/drm/i915/gem/i915_gem_internal.c +1 -0
@@ -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"
drivers/gpu/drm/i915/gem/i915_gem_internal.h new file +23 -0
@@ -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__ */
drivers/gpu/drm/i915/gem/selftests/huge_pages.c +2 -1
@@ -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"
drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c +1 -0
@@ -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_gt.h"
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c +3 -1
@@ -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"
drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c +1 -0
@@ -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"
drivers/gpu/drm/i915/gt/gen6_ppgtt.c +2 -0
@@ -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"
drivers/gpu/drm/i915/gt/intel_engine_cs.c +1 -0
@@ -6,6 +6,7 @@#include <drm/drm_print.h> #include "gem/i915_gem_context.h" +#include "gem/i915_gem_internal.h" #include "i915_cmd_parser.h" #include "i915_drv.h"
drivers/gpu/drm/i915/gt/intel_gt.c +4 -3
@@ -5,14 +5,16 @@#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_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_requests.h" #include "intel_migrate.h"
@@ -23,7 +25,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) {
drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c +1 -0
@@ -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"
drivers/gpu/drm/i915/gt/intel_gtt.c +1 -0
@@ -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"
drivers/gpu/drm/i915/gt/intel_renderstate.c +2 -0
@@ -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"
drivers/gpu/drm/i915/gt/intel_ring.c +1 -0
@@ -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"
drivers/gpu/drm/i915/gt/intel_ring_submission.c +2 -0
@@ -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"
drivers/gpu/drm/i915/gt/intel_timeline.c +2 -1
@@ -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"
drivers/gpu/drm/i915/gt/selftest_execlists.c +1 -0
@@ -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"
drivers/gpu/drm/i915/gt/selftest_hangcheck.c +1 -0
@@ -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"
drivers/gpu/drm/i915/gt/selftest_lrc.c +2 -0
@@ -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"
drivers/gpu/drm/i915/gt/selftest_migrate.c +2 -0
@@ -5,6 +5,8 @@#include <linux/sort.h> +#include "gem/i915_gem_internal.h" +#include "selftests/i915_random.h" static const unsigned int sizes[] = {
drivers/gpu/drm/i915/gt/selftest_rps.c +2 -0
@@ -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_gpu_commands.h"
drivers/gpu/drm/i915/gt/selftest_workarounds.c +1 -0
@@ -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"
drivers/gpu/drm/i915/i915_drv.h +0 -9
@@ -1684,15 +1684,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) {
drivers/gpu/drm/i915/i915_perf.c +1 -0
@@ -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_user.h" #include "gt/intel_execlists_submission.h"
drivers/gpu/drm/i915/selftests/i915_gem.c +2 -1
@@ -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"
drivers/gpu/drm/i915/selftests/i915_gem_evict.c +1 -0
@@ -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"
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +1 -0
@@ -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"
drivers/gpu/drm/i915/selftests/i915_request.c +1 -0
@@ -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"
drivers/gpu/drm/i915/selftests/i915_vma.c +1 -0
@@ -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"
drivers/gpu/drm/i915/selftests/igt_spinner.c +1 -0
@@ -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"
Signature · 1 line
2.30.2
PATCH 8/21 drm/i915: remove leftover i915_gem_pm.h declarations from i915_drv.h
In reply to Jani NikulaRemove the duplicates.
--- drivers/gpu/drm/i915/i915_drv.h | 4 ---- drivers/gpu/drm/i915/i915_gem.c | 1 + 2 files changed, 1 insertion(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -4
@@ -1658,10 +1658,6 @@ static inline u32 i915_reset_engine_count(struct i915_gpu_error *error,return atomic_read (&error->reset_engine_count[engine->uabi_class]); } -void i915_gem_suspend (struct drm_i915_private *dev_priv); -void i915_gem_suspend_late (struct drm_i915_private *dev_priv); -void i915_gem_resume (struct drm_i915_private *dev_priv); -int i915_gem_object_set_cache_level (struct drm_i915_gem_object *obj,enum i915_cache_level cache_level);
drivers/gpu/drm/i915/i915_gem.c +1 -0
@@ -44,6 +44,7 @@#include "gem/i915_gem_context.h" #include "gem/i915_gem_ioctls.h" #include "gem/i915_gem_mman.h" +#include "gem/i915_gem_pm.h" #include "gem/i915_gem_region.h" #include "gem/i915_gem_userptr.h" #include "gt/intel_engine_user.h"
Signature · 1 line
2.30.2
PATCH 9/21 drm/i915: split out gem/i915_gem_dmabuf.h from i915_drv.h
In reply to Jani NikulaWe already have the gem/i915_gem_dmabuf.c file.
--- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.h | 18 ++++++++++++++++++ drivers/gpu/drm/i915/gem/i915_gem_object.c | 2 ++ drivers/gpu/drm/i915/gvt/dmabuf.c | 2 ++ drivers/gpu/drm/i915/i915_driver.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 5 ----- 6 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_dmabuf.h
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +1 -0
@@ -11,6 +11,7 @@#include <asm/smp.h> +#include "gem/i915_gem_dmabuf.h" #include "i915_drv.h" #include "i915_gem_object.h" #include "i915_scatterlist.h"
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.h new file +18 -0
@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2022 Intel Corporation +*/ + +#ifndef __I915_GEM_DMABUF_H__ +#define __I915_GEM_DMABUF_H__ + +struct drm_gem_object ; +struct drm_device ; +struct dma_buf ; + +struct drm_gem_object *i915_gem_prime_import (struct drm_device *dev, +struct dma_buf *dma_buf); + +struct dma_buf *i915_gem_prime_export (struct drm_gem_object *gem_obj,int flags); + +#endif /* __I915_GEM_DMABUF_H__ */
drivers/gpu/drm/i915/gem/i915_gem_object.c +2 -0
@@ -26,9 +26,11 @@#include "display/intel_frontbuffer.h" #include "pxp/intel_pxp.h" +#include "i915_drv.h" #include "i915_gem_clflush.h" #include "i915_gem_context.h" +#include "i915_gem_dmabuf.h" #include "i915_gem_mman.h" #include "i915_gem_object.h" #include "i915_gem_ttm.h"
drivers/gpu/drm/i915/gvt/dmabuf.c +2 -0
@@ -31,6 +31,8 @@#include <linux/dma-buf.h> #include <linux/vfio.h> +#include "gem/i915_gem_dmabuf.h" +#include "i915_drv.h" #include "gvt.h"
drivers/gpu/drm/i915/i915_driver.c +1 -0
@@ -62,6 +62,7 @@#include "display/intel_vga.h" #include "gem/i915_gem_context.h" +#include "gem/i915_gem_dmabuf.h" #include "gem/i915_gem_ioctls.h" #include "gem/i915_gem_mman.h" #include "gem/i915_gem_pm.h"
drivers/gpu/drm/i915/i915_drv.h +0 -5
@@ -1661,11 +1661,6 @@ static inline u32 i915_reset_engine_count(struct i915_gpu_error *error,int i915_gem_object_set_cache_level (struct drm_i915_gem_object *obj,enum i915_cache_level cache_level); -struct drm_gem_object *i915_gem_prime_import (struct drm_device *dev, -struct dma_buf *dma_buf); - -struct dma_buf *i915_gem_prime_export (struct drm_gem_object *gem_obj,int flags); -static inline struct i915_address_space *i915_gem_vm_lookup (struct drm_i915_file_private *file_priv,u32 id) {
Signature · 1 line
2.30.2
PATCH 10/21 drm/i915: split out gem/i915_gem_create.h from i915_drv.h
In reply to Jani NikulaWe already have the gem/i915_gem_create.c file.
--- drivers/gpu/drm/i915/gem/i915_gem_create.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_create.h | 17 +++++++++++++++++ drivers/gpu/drm/i915/i915_driver.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 4 ---- 4 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_create.h
drivers/gpu/drm/i915/gem/i915_gem_create.c +1 -0
@@ -9,6 +9,7 @@#include "pxp/intel_pxp.h" #include "i915_drv.h" +#include "i915_gem_create.h" #include "i915_trace.h" #include "i915_user_extensions.h"
drivers/gpu/drm/i915/gem/i915_gem_create.h new file +17 -0
@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2021 Intel Corporation +*/ + +#ifndef __I915_GEM_CREATE_H__ +#define __I915_GEM_CREATE_H__ + +struct drm_file ; +struct drm_device ; +struct drm_mode_create_dumb ; + +int i915_gem_dumb_create (struct drm_file *file_priv, +struct drm_device *dev, +struct drm_mode_create_dumb *args); + +#endif /* __I915_GEM_CREATE_H__ */
drivers/gpu/drm/i915/i915_driver.c +1 -0
@@ -62,6 +62,7 @@#include "display/intel_vga.h" #include "gem/i915_gem_context.h" +#include "gem/i915_gem_create.h" #include "gem/i915_gem_dmabuf.h" #include "gem/i915_gem_ioctls.h" #include "gem/i915_gem_mman.h"
drivers/gpu/drm/i915/i915_drv.h +0 -4
@@ -1643,10 +1643,6 @@ static inline void i915_gem_drain_workqueue(struct drm_i915_private *i915)drain_workqueue (i915->wq); } -int i915_gem_dumb_create (struct drm_file *file_priv, -struct drm_device *dev, -struct drm_mode_create_dumb *args); -static inline u32 i915_reset_count (struct i915_gpu_error *error) {return atomic_read (&error->reset_count);
Signature · 1 line
2.30.2
PATCH 11/21 drm/i915: split out gem/i915_gem_domain.h from i915_drv.h
In reply to Jani NikulaWe already have the gem/i915_gem_domain.c file.
--- drivers/gpu/drm/i915/display/intel_dpt.c | 4 +++- drivers/gpu/drm/i915/display/intel_fb_pin.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 5 +++-- drivers/gpu/drm/i915/gem/i915_gem_domain.h | 15 +++++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 3 --- 5 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_domain.h
drivers/gpu/drm/i915/display/intel_dpt.c +3 -1
@@ -3,11 +3,13 @@* Copyright © 2021 Intel Corporation */ +#include "gem/i915_gem_domain.h" +#include "gt/gen8_ppgtt.h" +#include "i915_drv.h" #include "intel_display_types.h" #include "intel_dpt.h" #include "intel_fb.h" -#include "gt/gen8_ppgtt.h" struct i915_dpt {struct i915_address_space vm;
drivers/gpu/drm/i915/display/intel_fb_pin.c +1 -0
@@ -7,6 +7,7 @@* DOC: display pinning helpers */ +#include "gem/i915_gem_domain.h" #include "gem/i915_gem_object.h" #include "i915_drv.h"
drivers/gpu/drm/i915/gem/i915_gem_domain.c +3 -2
@@ -9,12 +9,13 @@#include "i915_drv.h" #include "i915_gem_clflush.h" +#include "i915_gem_domain.h" #include "i915_gem_gtt.h" #include "i915_gem_ioctls.h" -#include "i915_gem_object.h" -#include "i915_vma.h" #include "i915_gem_lmem.h" #include "i915_gem_mman.h" +#include "i915_gem_object.h" +#include "i915_vma.h" static bool gpu_write_needs_clflush (struct drm_i915_gem_object *obj) {
drivers/gpu/drm/i915/gem/i915_gem_domain.h new file +15 -0
@@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2022 Intel Corporation +*/ + +#ifndef __I915_GEM_DOMAIN_H__ +#define __I915_GEM_DOMAIN_H__ + +struct drm_i915_gem_object ; +enum i915_cache_level ; + +int i915_gem_object_set_cache_level (struct drm_i915_gem_object *obj, +enum i915_cache_level cache_level); + +#endif /* __I915_GEM_DOMAIN_H__ */
drivers/gpu/drm/i915/i915_drv.h +0 -3
@@ -1654,9 +1654,6 @@ static inline u32 i915_reset_engine_count(struct i915_gpu_error *error,return atomic_read (&error->reset_engine_count[engine->uabi_class]); } -int i915_gem_object_set_cache_level (struct drm_i915_gem_object *obj, -enum i915_cache_level cache_level); -static inline struct i915_address_space *i915_gem_vm_lookup (struct drm_i915_file_private *file_priv,u32 id) {
Signature · 1 line
2.30.2
PATCH 12/21 drm/i915: move i915_cache_level_str() static in i915_debugfs.c
In reply to Jani NikulaMove the function next to the only user.
--- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 11 ----------- drivers/gpu/drm/i915/i915_debugfs.c | 11 +++++++++++ drivers/gpu/drm/i915/i915_drv.h | 2 -- 3 files changed, 11 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/gt/intel_engine_cs.c +0 -11
@@ -1228,17 +1228,6 @@ void intel_engine_cancel_stop_cs(struct intel_engine_cs *engine)ENGINE_WRITE_FW (engine,RING_MI_MODE ,_MASKED_BIT_DISABLE (STOP_RING )); } -const char *i915_cache_level_str (struct drm_i915_private *i915,int type) -{ -switch (type) { -case I915_CACHE_NONE :return " uncached" ; -case I915_CACHE_LLC :return HAS_LLC (i915) ?" LLC" :" snooped" ; -case I915_CACHE_L3_LLC :return " L3+LLC" ; -case I915_CACHE_WT :return " WT" ; -default :return "" ; - } -} -static u32 read_subslice_reg (const struct intel_engine_cs *engine,int slice,int subslice,i915_reg_t reg)
drivers/gpu/drm/i915/i915_debugfs.c +11 -0
@@ -136,6 +136,17 @@ static const char *stringify_vma_type(const struct i915_vma *vma)return "ppgtt" ; } +static const char *i915_cache_level_str (struct drm_i915_private *i915,int type) +{ +switch (type) { +case I915_CACHE_NONE :return " uncached" ; +case I915_CACHE_LLC :return HAS_LLC (i915) ?" LLC" :" snooped" ; +case I915_CACHE_L3_LLC :return " L3+LLC" ; +case I915_CACHE_WT :return " WT" ; +default :return "" ; + } +} +void i915_debugfs_describe_obj (struct seq_file *m,struct drm_i915_gem_object *obj) {
drivers/gpu/drm/i915/i915_drv.h +0 -2
@@ -1677,8 +1677,6 @@ static inline bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_objeci915_gem_object_is_tiled (obj); } -const char *i915_cache_level_str (struct drm_i915_private *i915,int type); -/* intel_device_info.c */ static inline struct intel_device_info *mkwrite_device_info (struct drm_i915_private *dev_priv)
Signature · 1 line
2.30.2
PATCH 13/21 drm/i915: move i915_gem_vm_lookup() where it's used
In reply to Jani NikulaMove the function next to the only user. Arguably it's perhaps not the best place, but it's much better than having a static inline in a header.
--- drivers/gpu/drm/i915/gem/i915_gem_context.c | 15 +++++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 14 -------------- 2 files changed, 15 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_context.c +15 -0
@@ -343,6 +343,21 @@ static int proto_context_register(struct drm_i915_file_private *fpriv,return ret; } + +static struct i915_address_space * +i915_gem_vm_lookup (struct drm_i915_file_private *file_priv,u32 id) +{ +struct i915_address_space *vm; + +xa_lock (&file_priv->vm_xa); + vm =xa_load (&file_priv->vm_xa, id); +if (vm) +kref_get (&vm->ref); +xa_unlock (&file_priv->vm_xa); + +return vm; +} +static int set_proto_ctx_vm (struct drm_i915_file_private *fpriv,struct i915_gem_proto_context *pc,const struct drm_i915_gem_context_param *args)
drivers/gpu/drm/i915/i915_drv.h +0 -14
@@ -1654,20 +1654,6 @@ static inline u32 i915_reset_engine_count(struct i915_gpu_error *error,return atomic_read (&error->reset_engine_count[engine->uabi_class]); } -static inline struct i915_address_space * -i915_gem_vm_lookup (struct drm_i915_file_private *file_priv,u32 id) -{ -struct i915_address_space *vm; - -xa_lock (&file_priv->vm_xa); - vm =xa_load (&file_priv->vm_xa, id); -if (vm) -kref_get (&vm->ref); -xa_unlock (&file_priv->vm_xa); - -return vm; -} -/* i915_gem_tiling.c */ static inline bool i915_gem_object_needs_bit17_swizzle (struct drm_i915_gem_object *obj) {
Signature · 1 line
2.30.2
PATCH 15/21 drm/i915: split out i915_file_private.h from i915_drv.h
In reply to Jani NikulaLimit the scope of struct drm_i915_file_private to the files that actually need it.
--- drivers/gpu/drm/i915/gem/i915_gem_context.c | 1 + .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_object.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 1 + .../gpu/drm/i915/gem/selftests/mock_context.c | 1 + drivers/gpu/drm/i915/gt/intel_reset.c | 1 + drivers/gpu/drm/i915/i915_driver.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 93 --------------- drivers/gpu/drm/i915/i915_file_private.h | 108 ++++++++++++++++++ drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/i915_perf.c | 1 + 11 files changed, 117 insertions(+), 94 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_file_private.h
drivers/gpu/drm/i915/gem/i915_gem_context.c +1 -0
@@ -79,6 +79,7 @@#include "pxp/intel_pxp.h" +#include "i915_file_private.h" #include "i915_gem_context.h" #include "i915_trace.h" #include "i915_user_extensions.h"
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +1 -0
@@ -25,6 +25,7 @@#include "i915_cmd_parser.h" #include "i915_drv.h" +#include "i915_file_private.h" #include "i915_gem_clflush.h" #include "i915_gem_context.h" #include "i915_gem_evict.h"
drivers/gpu/drm/i915/gem/i915_gem_object.c +1 -0
@@ -28,6 +28,7 @@#include "pxp/intel_pxp.h" #include "i915_drv.h" +#include "i915_file_private.h" #include "i915_gem_clflush.h" #include "i915_gem_context.h" #include "i915_gem_dmabuf.h"
drivers/gpu/drm/i915/gem/i915_gem_throttle.c +1 -0
@@ -9,6 +9,7 @@#include <drm/drm_file.h> #include "i915_drv.h" +#include "i915_file_private.h" #include "i915_gem_context.h" #include "i915_gem_ioctls.h" #include "i915_gem_object.h"
drivers/gpu/drm/i915/gem/selftests/mock_context.c +1 -0
@@ -4,6 +4,7 @@* Copyright © 2016 Intel Corporation */ +#include "i915_file_private.h" #include "mock_context.h" #include "selftests/mock_drm.h" #include "selftests/mock_gtt.h"
drivers/gpu/drm/i915/gt/intel_reset.c +1 -0
@@ -12,6 +12,7 @@#include "gem/i915_gem_context.h" #include "i915_drv.h" +#include "i915_file_private.h" #include "i915_gpu_error.h" #include "i915_irq.h" #include "intel_breadcrumbs.h"
drivers/gpu/drm/i915/i915_driver.c +1 -0
@@ -73,6 +73,7 @@#include "pxp/intel_pxp_pm.h" +#include "i915_file_private.h" #include "i915_debugfs.h" #include "i915_driver.h" #include "i915_drv.h"
drivers/gpu/drm/i915/i915_drv.h +0 -93
105 lines not on this page · raw message
drivers/gpu/drm/i915/i915_file_private.h new file +108 -0
108 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem.c +1 -1
@@ -53,9 +53,9 @@#include "gt/intel_workarounds.h" #include "i915_drv.h" +#include "i915_file_private.h" #include "i915_trace.h" #include "i915_vgpu.h" -#include "intel_pm.h" static int
drivers/gpu/drm/i915/i915_perf.c +1 -0
@@ -207,6 +207,7 @@#include "gt/intel_ring.h" #include "i915_drv.h" +#include "i915_file_private.h" #include "i915_perf.h" /* HW requires this to be a power of two, between 128k and 16M, though driver
Signature · 1 line
2.30.2
PATCH 14/21 drm/i915: move i915_reset_count()/i915_reset_engine_count() out of i915_drv.h
In reply to Jani NikulaIt doesn't help much, as i915_drv.h includes i915_gpu_error.h, but it's a step in the right direction.
--- drivers/gpu/drm/i915/i915_drv.h | 11 ----------- drivers/gpu/drm/i915/i915_gpu_error.h | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -11
@@ -1643,17 +1643,6 @@ static inline void i915_gem_drain_workqueue(struct drm_i915_private *i915)drain_workqueue (i915->wq); } -static inline u32 i915_reset_count (struct i915_gpu_error *error) -{ -return atomic_read (&error->reset_count); -} - -static inline u32 i915_reset_engine_count (struct i915_gpu_error *error, -const struct intel_engine_cs *engine) -{ -return atomic_read (&error->reset_engine_count[engine->uabi_class]); -} -/* i915_gem_tiling.c */ static inline bool i915_gem_object_needs_bit17_swizzle (struct drm_i915_gem_object *obj) {
drivers/gpu/drm/i915/i915_gpu_error.h +11 -0
@@ -210,6 +210,17 @@ struct drm_i915_error_state_buf {int err; }; +static inline u32 i915_reset_count (struct i915_gpu_error *error) +{ +return atomic_read (&error->reset_count); +} + +static inline u32 i915_reset_engine_count (struct i915_gpu_error *error, +const struct intel_engine_cs *engine) +{ +return atomic_read (&error->reset_engine_count[engine->uabi_class]); +} +#if IS_ENABLED (CONFIG_DRM_I915_CAPTURE_ERROR )__printf (2 ,3 )
Signature · 1 line
2.30.2
PATCH 16/21 drm/i915: don't include drm_cache.h in i915_drv.h
In reply to Jani NikulaInclude it only in files that use it.
--- drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 2 ++ drivers/gpu/drm/i915/gem/i915_gem_context.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 ++ drivers/gpu/drm/i915/gem/i915_gem_object.c | 2 ++ drivers/gpu/drm/i915/gem/i915_gem_pages.c | 2 ++ drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 2 ++ drivers/gpu/drm/i915/gt/intel_ring_submission.c | 2 ++ drivers/gpu/drm/i915/gt/intel_timeline.c | 2 ++ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 2 ++ drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 ++ drivers/gpu/drm/i915/i915_cmd_parser.c | 2 ++ drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/i915_gem.c | 4 +++- drivers/gpu/drm/i915/i915_gpu_error.c | 1 + 14 files changed, 25 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_clflush.c +2 -0
@@ -4,6 +4,8 @@* Copyright © 2016 Intel Corporation */ +#include <drm/drm_cache.h> +#include "display/intel_frontbuffer.h" #include "i915_drv.h"
drivers/gpu/drm/i915/gem/i915_gem_context.c +1 -0
@@ -67,6 +67,7 @@#include <linux/log2.h> #include <linux/nospec.h> +#include <drm/drm_cache.h> #include <drm/drm_syncobj.h> #include "gt/gen6_ppgtt.h"
drivers/gpu/drm/i915/gem/i915_gem_mman.c +2 -0
@@ -9,6 +9,8 @@#include <linux/pfn_t.h> #include <linux/sizes.h> +#include <drm/drm_cache.h> +#include "gt/intel_gt.h" #include "gt/intel_gt_requests.h"
drivers/gpu/drm/i915/gem/i915_gem_object.c +2 -0
@@ -24,6 +24,8 @@#include <linux/sched/mm.h> +#include <drm/drm_cache.h> +#include "display/intel_frontbuffer.h" #include "pxp/intel_pxp.h"
drivers/gpu/drm/i915/gem/i915_gem_pages.c +2 -0
@@ -4,6 +4,8 @@* Copyright © 2014-2016 Intel Corporation */ +#include <drm/drm_cache.h> +#include "i915_drv.h" #include "i915_gem_object.h" #include "i915_scatterlist.h"
drivers/gpu/drm/i915/gem/i915_gem_shmem.c +2 -0
@@ -7,6 +7,8 @@#include <linux/pagevec.h> #include <linux/swap.h> +#include <drm/drm_cache.h> +#include "gem/i915_gem_region.h" #include "i915_drv.h" #include "i915_gemfs.h"
drivers/gpu/drm/i915/gt/intel_ring_submission.c +2 -0
@@ -3,6 +3,8 @@* Copyright © 2008-2021 Intel Corporation */ +#include <drm/drm_cache.h> +#include "gem/i915_gem_internal.h" #include "gen2_engine_cs.h"
drivers/gpu/drm/i915/gt/intel_timeline.c +2 -0
@@ -3,6 +3,8 @@* Copyright © 2016-2018 Intel Corporation */ +#include <drm/drm_cache.h> +#include "gem/i915_gem_internal.h" #include "i915_active.h"
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c +2 -0
@@ -3,6 +3,8 @@* Copyright © 2021 Intel Corporation */ +#include <drm/drm_cache.h> +#include "i915_drv.h" #include "intel_guc_slpc.h" #include "gt/intel_gt.h"
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +2 -0
@@ -5,6 +5,8 @@#include <linux/bitfield.h> #include <linux/firmware.h> + +#include <drm/drm_cache.h> #include <drm/drm_print.h> #include "gem/i915_gem_lmem.h"
drivers/gpu/drm/i915/i915_cmd_parser.c +2 -0
@@ -25,6 +25,8 @@* */ +#include <drm/drm_cache.h> +#include "gt/intel_engine.h" #include "gt/intel_gpu_commands.h"
drivers/gpu/drm/i915/i915_drv.h +0 -1
@@ -51,7 +51,6 @@#include <drm/drm_gem.h> #include <drm/drm_auth.h> -#include <drm/drm_cache.h> #include <drm/drm_util.h> #include <drm/drm_dsc.h> #include <drm/drm_atomic.h>
drivers/gpu/drm/i915/i915_gem.c +3 -1
@@ -25,7 +25,6 @@* */ -#include <drm/drm_vma_manager.h> #include <linux/dma-fence-array.h> #include <linux/kthread.h> #include <linux/dma-resv.h>
@@ -37,6 +36,9 @@#include <linux/dma-buf.h> #include <linux/mman.h> +#include <drm/drm_cache.h> +#include <drm/drm_vma_manager.h> +#include "display/intel_display.h" #include "display/intel_frontbuffer.h"
drivers/gpu/drm/i915/i915_gpu_error.c +1 -0
@@ -34,6 +34,7 @@#include <linux/utsname.h> #include <linux/zlib.h> +#include <drm/drm_cache.h> #include <drm/drm_print.h> #include "display/intel_dmc.h"
Signature · 1 line
2.30.2
PATCH 17/21 drm/i915: include shmem_fs.h only where needed
In reply to Jani NikulaDon't include shmem_fs.h in i915_drv.h, reducing the build dependencies.
--- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 ++ drivers/gpu/drm/i915/i915_drv.h | 1 - 3 files changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gem/i915_gem_shmem.c +1 -0
@@ -5,6 +5,7 @@*/ #include <linux/pagevec.h> +#include <linux/shmem_fs.h> #include <linux/swap.h> #include <drm/drm_cache.h>
drivers/gpu/drm/i915/gem/i915_gem_ttm.c +2 -0
@@ -3,6 +3,8 @@* Copyright © 2021 Intel Corporation */ +#include <linux/shmem_fs.h> +#include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_placement.h>
drivers/gpu/drm/i915/i915_drv.h +0 -1
@@ -46,7 +46,6 @@#include <linux/perf_event.h> #include <linux/pm_qos.h> #include <linux/dma-resv.h> -#include <linux/shmem_fs.h> #include <linux/stackdepot.h> #include <drm/drm_gem.h>
Signature · 1 line
2.30.2
PATCH 19/21 drm/i915: axe lots of unnecessary includes from i915_drv.h
In reply to Jani NikulaIt's fairly difficult to ensure these are actually not needed due to indirect includes via other files. However, it's easier to add them back as needed and, most importantly, where needed instead of exhaustively proving they're unnecessary.
--- drivers/gpu/drm/i915/i915_drv.h | 18 ------------------ 1 file changed, 18 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -18
@@ -34,25 +34,12 @@#include <asm/hypervisor.h> -#include <linux/io-mapping.h> #include <linux/i2c.h> #include <linux/i2c-algo-bit.h> -#include <linux/backlight.h> -#include <linux/hash.h> #include <linux/intel-iommu.h> -#include <linux/kref.h> -#include <linux/mm_types.h> -#include <linux/perf_event.h> #include <linux/pm_qos.h> -#include <linux/dma-resv.h> -#include <linux/stackdepot.h> -#include <drm/drm_gem.h> -#include <drm/drm_auth.h> -#include <drm/drm_util.h> -#include <drm/drm_dsc.h> #include <drm/drm_connector.h> -#include <drm/i915_mei_hdcp_interface.h> #include <drm/ttm/ttm_device.h> #include "i915_params.h"
@@ -90,17 +77,12 @@#include "intel_runtime_pm.h" #include "intel_step.h" #include "intel_uncore.h" -#include "intel_wakeref.h" #include "intel_wopcm.h" #include "i915_gem.h" -#include "i915_gem_gtt.h" #include "i915_gpu_error.h" #include "i915_perf_types.h" -#include "i915_request.h" #include "i915_scheduler.h" -#include "gt/intel_timeline.h" -#include "i915_vma.h" /* General customization:
Signature · 1 line
2.30.2
PATCH 18/21 drm/i915: include some drm headers only where needed
In reply to Jani NikulaInclude drm_fourcc.h, drm_plane.h, and drm_color_mgmt.h where needed, so we can drop the includes for drm_atomic.h and drm_fourcc.h from i915_drv.h, reducing the build dependencies.
--- drivers/gpu/drm/i915/gem/i915_gem_create.c | 2 ++ drivers/gpu/drm/i915/gvt/dmabuf.c | 3 +++ drivers/gpu/drm/i915/i915_drv.h | 2 -- drivers/gpu/drm/i915/i915_pci.c | 1 + 4 files changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_create.c +2 -0
@@ -3,6 +3,8 @@* Copyright © 2020 Intel Corporation */ +#include <drm/drm_fourcc.h> +#include "gem/i915_gem_ioctls.h" #include "gem/i915_gem_lmem.h" #include "gem/i915_gem_region.h"
drivers/gpu/drm/i915/gvt/dmabuf.c +3 -0
@@ -31,6 +31,9 @@#include <linux/dma-buf.h> #include <linux/vfio.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_plane.h> +#include "gem/i915_gem_dmabuf.h" #include "i915_drv.h"
drivers/gpu/drm/i915/i915_drv.h +0 -2
@@ -31,7 +31,6 @@#define _I915_DRV_H_#include <uapi/drm/i915_drm.h> -#include <uapi/drm/drm_fourcc.h> #include <asm/hypervisor.h>
@@ -52,7 +51,6 @@#include <drm/drm_auth.h> #include <drm/drm_util.h> #include <drm/drm_dsc.h> -#include <drm/drm_atomic.h> #include <drm/drm_connector.h> #include <drm/i915_mei_hdcp_interface.h> #include <drm/ttm/ttm_device.h>
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -22,6 +22,7 @@* */ +#include <drm/drm_color_mgmt.h> #include <drm/drm_drv.h> #include <drm/i915_pciids.h>
Signature · 1 line
2.30.2
PATCH 20/21 drm/i915: fix drm_i915.h include grouping and sorting
In reply to Jani NikulaGroup and sort includes in i915_drv.h similar to other places.
--- drivers/gpu/drm/i915/i915_drv.h | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +8 -11
@@ -42,10 +42,6 @@#include <drm/drm_connector.h> #include <drm/ttm/ttm_device.h> -#include "i915_params.h" -#include "i915_reg.h" -#include "i915_utils.h" -#include "display/intel_bios.h" #include "display/intel_cdclk.h" #include "display/intel_display.h"
@@ -60,9 +56,9 @@#include "display/intel_opregion.h" #include "gem/i915_gem_context_types.h" +#include "gem/i915_gem_lmem.h" #include "gem/i915_gem_shrinker.h" #include "gem/i915_gem_stolen.h" -#include "gem/i915_gem_lmem.h" #include "gt/intel_engine.h" #include "gt/intel_gt_types.h"
@@ -70,6 +66,13 @@#include "gt/intel_workarounds.h" #include "gt/uc/intel_uc.h" +#include "i915_gem.h" +#include "i915_gpu_error.h" +#include "i915_params.h" +#include "i915_perf_types.h" +#include "i915_reg.h" +#include "i915_scheduler.h" +#include "i915_utils.h" #include "intel_device_info.h" #include "intel_memory_region.h" #include "intel_pch.h"
@@ -79,12 +82,6 @@#include "intel_uncore.h" #include "intel_wopcm.h" -#include "i915_gem.h" -#include "i915_gpu_error.h" -#include "i915_perf_types.h" -#include "i915_scheduler.h" - -/* General customization: */
Signature · 1 line
2.30.2
PATCH 21/21 drm/i915: group drm_i915.h forward declarations together
In reply to Jani NikulaDo the same as in other files, group forward declarations together near the top.
--- drivers/gpu/drm/i915/i915_drv.h | 45 +++++++++++++++------------------ 1 file changed, 20 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +20 -25
@@ -82,6 +82,26 @@#include "intel_uncore.h" #include "intel_wopcm.h" +struct dpll ; +struct drm_i915_gem_object ; +struct drm_i915_private ; +struct intel_atomic_state ; +struct intel_audio_funcs ; +struct intel_cdclk_config ; +struct intel_cdclk_funcs ; +struct intel_cdclk_state ; +struct intel_cdclk_vals ; +struct intel_connector ; +struct intel_crtc ; +struct intel_dp ; +struct intel_encoder ; +struct intel_fbdev ; +struct intel_initial_plane_config ; +struct intel_limit ; +struct intel_overlay ; +struct intel_overlay_error_state ; +struct vlv_s0ix_state ; +/* General customization: */
@@ -90,8 +110,6 @@#define DRIVER_DATE "20201103"#define DRIVER_TIMESTAMP 1604406085 -struct drm_i915_gem_object ; -/* Threshold == 5 for long IRQs, 50 for short */ #define HPD_STORM_DEFAULT_THRESHOLD 50
@@ -141,8 +159,6 @@ struct i915_hotplug {I915_GEM_DOMAIN_INSTRUCTION | \ I915_GEM_DOMAIN_VERTEX) -struct drm_i915_private ; -/* Interface history: * * 1.1: Original.
@@ -157,9 +173,6 @@ struct drm_i915_private;#define DRIVER_MINOR 6#define DRIVER_PATCHLEVEL 0 -struct intel_overlay ; -struct intel_overlay_error_state ; -struct sdvo_device_mapping {u8 initialized;u8 dvo_port;
@@ -169,18 +182,6 @@ struct sdvo_device_mapping {u8 ddc_pin; }; -struct intel_connector ; -struct intel_encoder ; -struct intel_atomic_state ; -struct intel_cdclk_config ; -struct intel_cdclk_funcs ; -struct intel_cdclk_state ; -struct intel_cdclk_vals ; -struct intel_initial_plane_config ; -struct intel_crtc ; -struct intel_limit ; -struct dpll ; -/* functions used internal in intel_pm.c */ struct drm_i915_clock_gating_funcs {void (*init_clock_gating)(struct drm_i915_private *dev_priv);
@@ -268,7 +269,6 @@ enum drrs_support_type {SEAMLESS_DRRS_SUPPORT =2 }; -struct intel_dp ;struct i915_drrs {struct mutex mutex;struct delayed_work work;
@@ -286,8 +286,6 @@ struct i915_drrs {#define QUIRK_INCREASE_DDI_DISABLED_TIME (1<<7)#define QUIRK_NO_PPS_BACKLIGHT_POWER_HOOK (1<<8) -struct intel_fbdev ; -struct intel_gmbus {struct i2c_adapter adapter;#define GMBUS_FORCE_BIT_RETRY (1U << 31)
@@ -306,8 +304,6 @@ struct i915_suspend_saved_registers {u16 saveGCDGMBUS; }; -struct vlv_s0ix_state ; -#define MAX_L3_SLICES 2struct intel_l3_parity {u32 *remap_info[MAX_L3_SLICES ];
@@ -504,7 +500,6 @@ struct i915_selftest_stash { };/* intel_audio.c private */ -struct intel_audio_funcs ;struct intel_audio_private {/* Display internal audio functions */ const struct intel_audio_funcs *funcs;
Signature · 1 line
2.30.2
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: clean up i915_drv.h
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: clean up i915_drv.h
URL : https://patchwork.freedesktop.org/series/98515/
State : failure
== Summary ==
Applying: drm/i915: split out i915_getparam.h from i915_drv.h
Applying: drm/i915: split out i915_cmd_parser.h from i915_drv.h
Applying: drm/i915: split out i915_gem_evict.h from i915_drv.h
Applying: drm/i915: split out gem/i915_gem_userptr.h from i915_drv.h
Applying: drm/i915: split out gem/i915_gem_tiling.h from i915_drv.h
Applying: drm/i915: split out i915_gem.h declarations from i915_drv.h
Applying: drm/i915: split out i915_gem_internal.h from i915_drv.h
error: sha1 information is lacking or useless (drivers/gpu/drm/i915/i915_drv.h).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0007 drm/i915: split out i915_gem_internal.h from i915_drv.h When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Re: [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: clean up i915_drv.h
Quoted 8 lines · Patchwork
== Series Details ==
Series: drm/i915: clean up
i915_drv.h
URL : https://patchwork.freedesktop.org/series/98515/
State : failure== Summary ==
Quoted 14 lines
Applying: drm/i915: split out
i915_getparam.hfromi915_drv.h
Applying: drm/i915: split outi915_cmd_parser.hfromi915_drv.h
Applying: drm/i915: split outi915_gem_evict.hfromi915_drv.h
Applying: drm/i915: split outgem/i915_gem_userptr.hfromi915_drv.h
Applying: drm/i915: split outgem/i915_gem_tiling.hfromi915_drv.h
Applying: drm/i915: split outi915_gem.hdeclarations fromi915_drv.h
Applying: drm/i915: split outi915_gem_internal.hfromi915_drv.h
error: sha1 information is lacking or useless (drivers/gpu/drm/i915/i915_drv.h).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0007 drm/i915: split outi915_gem_internal.hfromi915_drv.hWhen you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Don't know what gives, the series rebases just fine without conflicts.
I guess let's review first, and I'll split smaller series for CI because this is going to be painful.
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Re: [Intel-gfx] [PATCH 03/21] drm/i915: split out i915_gem_evict.h from i915_drv.h
In reply to Jani NikulaQuoted 1 line · Jani Nikula
We already have the
i915_gem_evicti915.cfile.
There's a stray paste here and a few new headers got the 2021 copyright, but other than that it all looks fine to me. For the series:
(I actually scrolled through it all so perhaps it can even be an r-b if you want.)
Regards,
Tvrtko
Quoted 125 lines
Signed-off-by Jani Nikula <[email protected]>--- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 1 + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 11 --------- drivers/gpu/drm/i915/i915_gem_evict.c | 1 + drivers/gpu/drm/i915/i915_gem_evict.h | 24 +++++++++++++++++++ drivers/gpu/drm/i915/i915_gem_gtt.c | 1 + drivers/gpu/drm/i915/i915_vma.c | 1 + 7 files changed, 29 insertions(+), 11 deletions(-)create mode 100644
drivers/gpu/drm/i915/i915_gem_evict.hdrivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +1
-0@@ -27,6 +27,7 @@#include "i915_drv.h" #include "i915_gem_clflush.h" #include "i915_gem_context.h" +#include "i915_gem_evict.h" #include "i915_gem_ioctls.h" #include "i915_trace.h" #include "i915_user_extensions.h" drivers/gpu/drm/i915/gt/selftest_hangcheck.c +1
-0@@ -7,6 +7,7 @@#include "gem/i915_gem_context.h" +#include "i915_gem_evict.h" #include "intel_gt.h" #include "intel_engine_heartbeat.h" #include "intel_engine_pm.h" drivers/gpu/drm/i915/i915_drv.h +0
-11@@ -1718,17 +1718,6 @@ i915_gem_vm_lookup(struct drm_i915_file_private *file_priv, u32 id)return vm; } -/* i915_gem_evict.c */ -int __must_check i915_gem_evict_something (struct i915_address_space *vm, -u64 min_size,u64 alignment, -unsigned long color, -u64 start,u64 end, -unsigned flags); -int __must_check i915_gem_evict_for_node (struct i915_address_space *vm, -struct drm_mm_node *node, -unsigned int flags); -int i915_gem_evict_vm (struct i915_address_space *vm); -/* i915_gem_internal.c */ struct drm_i915_gem_object * i915_gem_object_create_internal(struct drm_i915_private *dev_priv,drivers/gpu/drm/i915/i915_gem_evict.c +1
-0@@ -31,6 +31,7 @@#include "gt/intel_gt_requests.h" #include "i915_drv.h" +#include "i915_gem_evict.h" #include "i915_trace.h" I915_SELFTEST_DECLARE(static struct igt_evict_ctl {drivers/gpu/drm/i915/i915_gem_evict.h new file +24
-0@@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2021 Intel Corporation +*/ + +#ifndef __I915_GEM_EVICT_H__ +#define __I915_GEM_EVICT_H__ + +#include <linux/types.h> + +struct drm_mm_node ; +struct i915_address_space ; + +int __must_check i915_gem_evict_something (struct i915_address_space *vm, +u64 min_size,u64 alignment, +unsigned long color, +u64 start,u64 end, +unsigned flags); +int __must_check i915_gem_evict_for_node (struct i915_address_space *vm, +struct drm_mm_node *node, +unsigned int flags); +int i915_gem_evict_vm (struct i915_address_space *vm); + +#endif /* __I915_GEM_EVICT_H__ */ drivers/gpu/drm/i915/i915_gem_gtt.c +1
-0@@ -20,6 +20,7 @@#include "gt/intel_gt_requests.h" #include "i915_drv.h" +#include "i915_gem_evict.h" #include "i915_scatterlist.h" #include "i915_trace.h" #include "i915_vgpu.h" drivers/gpu/drm/i915/i915_vma.c +1
-0@@ -34,6 +34,7 @@#include "gt/intel_gt_requests.h" #include "i915_drv.h" +#include "i915_gem_evict.h" #include "i915_sw_fence_work.h" #include "i915_trace.h" #include "i915_vma.h"
Re: [Intel-gfx] [PATCH 03/21] drm/i915: split out i915_gem_evict.h from i915_drv.h
Quoted 5 lines · Tvrtko Ursulin
Quoted 1 line · Jani Nikula
We already have the
i915_gem_evicti915.cfile.There's a stray paste here and a few new headers got the 2021 copyright, but other than that it all looks fine to me. For the series:
Thanks, fixed.
Some of them have the 2021 copyright, because that's when they've been written.
Quoted 1 line
Acked-by Tvrtko Ursulin <[email protected]>
Thanks.
I'm sending the first five separately for CI and merging, chopping it up a bit.
I wonder if we can just merge this via drm-intel-next. It's not that far away that we can merge to drm-next and backmerge again.
BR,
Jani.
Quoted 133 lines
(I actually scrolled through it all so perhaps it can even be an r-b if you want.)
Regards,
Tvrtko
Quoted 125 lines
Signed-off-by Jani Nikula <[email protected]>--- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 1 + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 11 --------- drivers/gpu/drm/i915/i915_gem_evict.c | 1 + drivers/gpu/drm/i915/i915_gem_evict.h | 24 +++++++++++++++++++ drivers/gpu/drm/i915/i915_gem_gtt.c | 1 + drivers/gpu/drm/i915/i915_vma.c | 1 + 7 files changed, 29 insertions(+), 11 deletions(-)create mode 100644
drivers/gpu/drm/i915/i915_gem_evict.hdrivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +1
-0@@ -27,6 +27,7 @@#include "i915_drv.h" #include "i915_gem_clflush.h" #include "i915_gem_context.h" +#include "i915_gem_evict.h" #include "i915_gem_ioctls.h" #include "i915_trace.h" #include "i915_user_extensions.h" drivers/gpu/drm/i915/gt/selftest_hangcheck.c +1
-0@@ -7,6 +7,7 @@#include "gem/i915_gem_context.h" +#include "i915_gem_evict.h" #include "intel_gt.h" #include "intel_engine_heartbeat.h" #include "intel_engine_pm.h" drivers/gpu/drm/i915/i915_drv.h +0
-11@@ -1718,17 +1718,6 @@ i915_gem_vm_lookup(struct drm_i915_file_private *file_priv, u32 id)return vm; } -/* i915_gem_evict.c */ -int __must_check i915_gem_evict_something (struct i915_address_space *vm, -u64 min_size,u64 alignment, -unsigned long color, -u64 start,u64 end, -unsigned flags); -int __must_check i915_gem_evict_for_node (struct i915_address_space *vm, -struct drm_mm_node *node, -unsigned int flags); -int i915_gem_evict_vm (struct i915_address_space *vm); -/* i915_gem_internal.c */ struct drm_i915_gem_object * i915_gem_object_create_internal(struct drm_i915_private *dev_priv,drivers/gpu/drm/i915/i915_gem_evict.c +1
-0@@ -31,6 +31,7 @@#include "gt/intel_gt_requests.h" #include "i915_drv.h" +#include "i915_gem_evict.h" #include "i915_trace.h" I915_SELFTEST_DECLARE(static struct igt_evict_ctl {drivers/gpu/drm/i915/i915_gem_evict.h new file +24
-0@@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2021 Intel Corporation +*/ + +#ifndef __I915_GEM_EVICT_H__ +#define __I915_GEM_EVICT_H__ + +#include <linux/types.h> + +struct drm_mm_node ; +struct i915_address_space ; + +int __must_check i915_gem_evict_something (struct i915_address_space *vm, +u64 min_size,u64 alignment, +unsigned long color, +u64 start,u64 end, +unsigned flags); +int __must_check i915_gem_evict_for_node (struct i915_address_space *vm, +struct drm_mm_node *node, +unsigned int flags); +int i915_gem_evict_vm (struct i915_address_space *vm); + +#endif /* __I915_GEM_EVICT_H__ */ drivers/gpu/drm/i915/i915_gem_gtt.c +1
-0@@ -20,6 +20,7 @@#include "gt/intel_gt_requests.h" #include "i915_drv.h" +#include "i915_gem_evict.h" #include "i915_scatterlist.h" #include "i915_trace.h" #include "i915_vgpu.h" drivers/gpu/drm/i915/i915_vma.c +1
-0@@ -34,6 +34,7 @@#include "gt/intel_gt_requests.h" #include "i915_drv.h" +#include "i915_gem_evict.h" #include "i915_sw_fence_work.h" #include "i915_trace.h" #include "i915_vma.h"
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center