Commit f9bf77df authored by Jani Nikula's avatar Jani Nikula
Browse files

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: default avatarJani Nikula <jani.nikula@intel.com>
Acked-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/7af2f698a320c1efb0563f56a432c6d122d40b94.1644507885.git.jani.nikula@intel.com
parent d83d5298

drivers/gpu/drm/i915/i915_drv.h

+0 −11
Original line number Diff line number Diff line
@@ -1599,17 +1599,6 @@ void i915_gem_runtime_suspend(struct drm_i915_private *dev_priv); 


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);

}



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]);

}



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);

drivers/gpu/drm/i915/i915_gpu_error.h

+11 −0
Original line number Diff line number Diff line
@@ -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)