On Thu, 21 Oct 2021, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > A bunch of function prototypes were left behind when the > plane/crtc code got reshuffled to new files. Move the > prototypes as well. Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx> > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_crtc.h | 5 +++++ > drivers/gpu/drm/i915/display/intel_psr.c | 2 +- > drivers/gpu/drm/i915/display/intel_sprite.h | 4 ---- > 3 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_crtc.h b/drivers/gpu/drm/i915/display/intel_crtc.h > index a5ae997581aa..22363fbbc925 100644 > --- a/drivers/gpu/drm/i915/display/intel_crtc.h > +++ b/drivers/gpu/drm/i915/display/intel_crtc.h > @@ -9,10 +9,13 @@ > #include <linux/types.h> > > enum pipe; > +struct drm_display_mode; > struct drm_i915_private; > struct intel_crtc; > struct intel_crtc_state; > > +int intel_usecs_to_scanlines(const struct drm_display_mode *adjusted_mode, > + int usecs); > u32 intel_crtc_max_vblank_count(const struct intel_crtc_state *crtc_state); > int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe); > struct intel_crtc_state *intel_crtc_state_alloc(struct intel_crtc *crtc); > @@ -21,5 +24,7 @@ void intel_crtc_state_reset(struct intel_crtc_state *crtc_state, > u32 intel_crtc_get_vblank_counter(struct intel_crtc *crtc); > void intel_crtc_vblank_on(const struct intel_crtc_state *crtc_state); > void intel_crtc_vblank_off(const struct intel_crtc_state *crtc_state); > +void intel_pipe_update_start(const struct intel_crtc_state *new_crtc_state); > +void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state); > > #endif > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c > index 49c2dfbd4055..ccffe05784d3 100644 > --- a/drivers/gpu/drm/i915/display/intel_psr.c > +++ b/drivers/gpu/drm/i915/display/intel_psr.c > @@ -28,13 +28,13 @@ > > #include "i915_drv.h" > #include "intel_atomic.h" > +#include "intel_crtc.h" > #include "intel_de.h" > #include "intel_display_types.h" > #include "intel_dp_aux.h" > #include "intel_hdmi.h" > #include "intel_psr.h" > #include "intel_snps_phy.h" > -#include "intel_sprite.h" > #include "skl_universal_plane.h" > > /** > diff --git a/drivers/gpu/drm/i915/display/intel_sprite.h b/drivers/gpu/drm/i915/display/intel_sprite.h > index c085eb87705c..4f63e4967731 100644 > --- a/drivers/gpu/drm/i915/display/intel_sprite.h > +++ b/drivers/gpu/drm/i915/display/intel_sprite.h > @@ -27,14 +27,10 @@ struct intel_plane_state; > #define VBLANK_EVASION_TIME_US 100 > #endif > > -int intel_usecs_to_scanlines(const struct drm_display_mode *adjusted_mode, > - int usecs); > struct intel_plane *intel_sprite_plane_create(struct drm_i915_private *dev_priv, > enum pipe pipe, int plane); > int intel_sprite_set_colorkey_ioctl(struct drm_device *dev, void *data, > struct drm_file *file_priv); > -void intel_pipe_update_start(const struct intel_crtc_state *new_crtc_state); > -void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state); > int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state); > int chv_plane_check_rotation(const struct intel_plane_state *plane_state); -- Jani Nikula, Intel Open Source Graphics Center
