Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915: move i915_reset_count()/i915_reset_engine_count() out of i915_drv.h

It doesn't help much, as i915_drv.h includes i915_gpu_error.h, but it's
a step in the right direction.

Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/7af2f698a320c1efb0563f56a432c6d122d40b94.1644507885.git.jani.nikula@intel.com

+11 -11
-11
drivers/gpu/drm/i915/i915_drv.h
··· 1599 1599 1600 1600 int __must_check i915_gem_set_global_seqno(struct drm_device *dev, u32 seqno); 1601 1601 1602 - static inline u32 i915_reset_count(struct i915_gpu_error *error) 1603 - { 1604 - return atomic_read(&error->reset_count); 1605 - } 1606 - 1607 - static inline u32 i915_reset_engine_count(struct i915_gpu_error *error, 1608 - const struct intel_engine_cs *engine) 1609 - { 1610 - return atomic_read(&error->reset_engine_count[engine->uabi_class]); 1611 - } 1612 - 1613 1602 int __must_check i915_gem_init(struct drm_i915_private *dev_priv); 1614 1603 void i915_gem_driver_register(struct drm_i915_private *i915); 1615 1604 void i915_gem_driver_unregister(struct drm_i915_private *i915);
+11
drivers/gpu/drm/i915/i915_gpu_error.h
··· 210 210 int err; 211 211 }; 212 212 213 + static inline u32 i915_reset_count(struct i915_gpu_error *error) 214 + { 215 + return atomic_read(&error->reset_count); 216 + } 217 + 218 + static inline u32 i915_reset_engine_count(struct i915_gpu_error *error, 219 + const struct intel_engine_cs *engine) 220 + { 221 + return atomic_read(&error->reset_engine_count[engine->uabi_class]); 222 + } 223 + 213 224 #if IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR) 214 225 215 226 __printf(2, 3)