drm/i915: clean up i915_drv.h, part 2
Subsystems (4)
cover drm/i915: clean up i915_drv.h, part 2
Next six patches from [1], chopping it up a bit.
BR,
Jani.
[1] https://patchwork.freedesktop.org/series/98515/
Jani Nikula (6):
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
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_create.c | 1 + 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 +++++ 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_object.c | 2 + .../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/gvt/dmabuf.c | 2 + drivers/gpu/drm/i915/i915_driver.c | 2 + drivers/gpu/drm/i915/i915_drv.h | 57 ------------------- drivers/gpu/drm/i915/i915_gem.c | 1 + drivers/gpu/drm/i915/i915_gem.h | 36 ++++++++++++ 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 + 44 files changed, 169 insertions(+), 67 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
Signature · 1 line
2.30.2
PATCH 1/6 drm/i915: split out i915_gem.h declarations from i915_drv.h
i915_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
@@ -1603,9 +1603,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) {/*
@@ -1644,32 +1641,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);
@@ -1681,17 +1656,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 2/6 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
@@ -6,14 +6,16 @@#include <drm/drm_managed.h> #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"
@@ -24,7 +26,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
@@ -1682,15 +1682,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 3/6 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
@@ -1656,10 +1656,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 4/6 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
@@ -1659,11 +1659,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 5/6 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
@@ -1641,10 +1641,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 6/6 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
@@ -1652,9 +1652,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
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: clean up i915_drv.h, part 2
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: clean up i915_drv.h, part 2
URL : https://patchwork.freedesktop.org/series/98691/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 69bb96496495 drm/i915: split out i915_gem.h declarations from i915_drv.h 480ab58f49c9 drm/i915: split out i915_gem_internal.h from i915_drv.h -:49: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #49: new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 285 lines checkeda2486d274724 drm/i915: remove leftover i915_gem_pm.h declarations from i915_drv.h 28f18c92ae4b drm/i915: split out gem/i915_gem_dmabuf.h from i915_drv.h
-:24: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #24:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 62 lines checked93c54bee9e3e drm/i915: split out gem/i915_gem_create.h from i915_drv.h
-:24: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #24:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 41 lines checked1a29182142e1 drm/i915: split out gem/i915_gem_domain.h from i915_drv.h
-:63: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #63:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 60 lines checked
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: clean up i915_drv.h, part 2
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: clean up i915_drv.h, part 2
URL : https://patchwork.freedesktop.org/series/98691/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip Sparse version: v0.6.2 Fast mode used, each commit won't be checked separately.
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: clean up i915_drv.h, part 2
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: clean up i915_drv.h, part 2
URL : https://patchwork.freedesktop.org/series/98691/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_11061 -> Patchwork_21957
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_21957 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_21957, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21957/index.html
Participating hosts (46 -> 37)
------------------------------
Additional (1): fi-icl-u2
Missing (10): fi-bdw-samus bat-dg1-6 bat-dg1-5 fi-bsw-cyan bat-adlp-6 bat-adlp-4 bat-rpls-1 bat-rpls-2 bat-jsl-2 bat-jsl-1
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_21957:
### IGT changes ###
#### Possible regressions ####
* igt@gem_exec_suspend@basic-s0@smem:
- fi-kbl-soraka: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11061/fi-kbl-soraka/igt@gem_exec_suspend@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21957/fi-kbl-soraka/igt@gem_exec_suspend@[email protected]
Known issues
------------
Here are the changes found in Patchwork_21957 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@cs-gfx:
- fi-hsw-4770: NOTRUN -> [SKIP][3] ([fdo#109271] / [fdo#109315]) +17 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21957/fi-hsw-4770/igt@amdgpu/[email protected]
* igt@amdgpu/amd_basic@query-info:
- fi-bsw-kefka: NOTRUN -> [SKIP][4] ([fdo#109271]) +17 similar issues
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21957/fi-bsw-kefka/igt@amdgpu/[email protected]
* igt@amdgpu/amd_cs_nop@fork-gfx0:
- fi-icl-u2: NOTRUN -> [SKIP][5] ([fdo#109315]) +17 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21957/fi-icl-u2/igt@amdgpu/[email protected]
* igt@gem_huc_copy@huc-copy:
- fi-icl-u2: NOTRUN -> [SKIP][6] ([i915#2190])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21957/fi-icl-u2/igt@[email protected]
* igt@gem_lmem_swapping@parallel-random-engines:
- fi-icl-u2: NOTRUN -> [SKIP][7] ([i915#4613]) +3 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21957/fi-icl-u2/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-icl-u2: NOTRUN -> [SKIP][8] ([fdo#111827]) +8 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21957/fi-icl-u2/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- fi-icl-u2: NOTRUN -> [SKIP][9] ([fdo#109278]) +2 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21957/fi-icl-u2/igt@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- fi-icl-u2: NOTRUN -> [SKIP][10] ([fdo#109285])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21957/fi-icl-u2/igt@[email protected]
* igt@prime_vgem@basic-userptr:
- fi-icl-u2: NOTRUN -> [SKIP][11] ([i915#3301])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21957/fi-icl-u2/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live@execlists:
- fi-bsw-kefka: [INCOMPLETE][12] ([i915#2940]) -> [PASS][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11061/fi-bsw-kefka/igt@i915_selftest@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21957/fi-bsw-kefka/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@hangcheck:
- fi-hsw-4770: [INCOMPLETE][14] ([i915#4785]) -> [PASS][15]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11061/fi-hsw-4770/igt@i915_selftest@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21957/fi-hsw-4770/igt@i915_selftest@[email protected]
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2940]: https://gitlab.freedesktop.org/drm/intel/issues/2940
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4785]: https://gitlab.freedesktop.org/drm/intel/issues/4785
Build changes
-------------
* Linux: CI_DRM_11061 -> Patchwork_21957
CI-20190529: 20190529
CI_DRM_11061: 0ee2fe64a0021c173a686de95f9961c35c82cb99 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6326: ec75f64fcbcf4aac58fbf1bf629e8f59b19db4ce @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_21957: 1a29182142e1815e4f552d536ee693173f3cd896 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
1a29182142e1 drm/i915: split out gem/i915_gem_domain.h from i915_drv.h 93c54bee9e3e drm/i915: split out gem/i915_gem_create.h from i915_drv.h 28f18c92ae4b drm/i915: split out gem/i915_gem_dmabuf.h from i915_drv.h a2486d274724 drm/i915: remove leftover i915_gem_pm.h declarations from i915_drv.h 480ab58f49c9 drm/i915: split out i915_gem_internal.h from i915_drv.h 69bb96496495 drm/i915: split out i915_gem.h declarations from i915_drv.h
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21957/index.html
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: clean up i915_drv.h, part 2 (rev3)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: clean up i915_drv.h, part 2 (rev3)
URL : https://patchwork.freedesktop.org/series/98691/
State : failure
== Summary ==
Applying: drm/i915: split out i915_gem.h declarations from i915_drv.h Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_drv.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 drm/i915: split out i915_gem.h declarations 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".