Commit e669ad6f authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

drm/i915/display: add namespace to intel_finish_reset 



Rename intel_finish_reset to intel_display_finish_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-2-lucas.demarchi@intel.com
parent 87ebfaab

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

+1 −1
Original line number Diff line number Diff line
@@ -4911,7 +4911,7 @@ void intel_display_prepare_reset(struct drm_i915_private *dev_priv) 
	state->acquire_ctx = ctx;

}













void intel_finish_reset(struct drm_i915_private *dev_priv)













void intel_display_finish_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








@@ -591,7 +591,7 @@ int lpt_get_iclkip(struct drm_i915_private *dev_priv);













bool intel_fuzzy_clock_check(int clock1, int clock2);































void intel_display_prepare_reset(struct drm_i915_private *dev_priv);













void intel_finish_reset(struct drm_i915_private *dev_priv);













void intel_display_finish_reset(struct drm_i915_private *dev_priv);















void intel_dp_get_m_n(struct intel_crtc *crtc,















		      struct intel_crtc_state *pipe_config);















void intel_dp_set_m_n(const struct intel_crtc_state *crtc_state,

































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



+1
−1






























Original line number
Diff line number
Diff line








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





























		intel_gt_reset(gt, engine_mask, reason);





























		intel_finish_reset(gt->i915);













		intel_display_finish_reset(gt->i915);















	}































	if (!test_bit(I915_WEDGED, &gt->reset.flags))



































































CRA Git | Maintained and supported by SUSTech CRA and CCSE