Commit 87ebfaab authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

drm/i915/display: add namespace to intel_prepare_reset 



Rename intel_prepare_reset to intel_display_prepare_reset, so it's clear
from gt/ that we are calling out the display code.

Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201106225531.920641-1-lucas.demarchi@intel.com
parent 230edf78

drivers/gpu/drm/i915/display/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -4851,7 +4851,7 @@ static bool gpu_reset_clobbers_display(struct drm_i915_private *dev_priv) 
		intel_has_gpu_reset(&dev_priv->gt));

}













void intel_prepare_reset(struct drm_i915_private *dev_priv)













void intel_display_prepare_reset(struct drm_i915_private *dev_priv)















{















	struct drm_device *dev = &dev_priv->drm;















	struct drm_modeset_acquire_ctx *ctx = &dev_priv->reset_ctx;

































drivers/gpu/drm/i915/display/intel_display.h



+1
−1






























Original line number
Diff line number
Diff line








@@ -590,7 +590,7 @@ void vlv_force_pll_off(struct drm_i915_private *dev_priv, enum pipe pipe);













int lpt_get_iclkip(struct drm_i915_private *dev_priv);















bool intel_fuzzy_clock_check(int clock1, int clock2);





























void intel_prepare_reset(struct drm_i915_private *dev_priv);













void intel_display_prepare_reset(struct drm_i915_private *dev_priv);















void intel_finish_reset(struct drm_i915_private *dev_priv);















void intel_dp_get_m_n(struct intel_crtc *crtc,















		      struct intel_crtc_state *pipe_config);

































drivers/gpu/drm/i915/gt/intel_reset.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -1190,7 +1190,7 @@ static void intel_gt_reset_global(struct intel_gt *gt,





























	/* Use a watchdog to ensure that our reset completes */















	intel_wedge_on_timeout(&w, gt, 5 * HZ) {













		intel_prepare_reset(gt->i915);













		intel_display_prepare_reset(gt->i915);































		/* Flush everyone using a resource about to be clobbered */















		synchronize_srcu_expedited(&gt->reset.backoff_srcu);



































































CRA Git | Maintained and supported by SUSTech CRA and CCSE