On Fri, 06 Nov 2020, Lucas De Marchi <lucas.demarchi@xxxxxxxxx> wrote: > Rename intel_finish_reset to intel_display_finish_reset, so it's clear > from gt/ that we are calling out the display code. Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx> > > Signed-off-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_display.c | 2 +- > drivers/gpu/drm/i915/display/intel_display.h | 2 +- > drivers/gpu/drm/i915/gt/intel_reset.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 4050bc60f632..ab04c89cdf05 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -5011,7 +5011,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; > diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h > index 30960cc8b8a6..a988f9518ece 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.h > +++ b/drivers/gpu/drm/i915/display/intel_display.h > @@ -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, > diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c > index d71bad8c07b7..6b07ff5249f5 100644 > --- a/drivers/gpu/drm/i915/gt/intel_reset.c > +++ b/drivers/gpu/drm/i915/gt/intel_reset.c > @@ -1198,7 +1198,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, >->reset.flags)) -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx