On Tue, 18 Apr 2023, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > Move the VBLANK_EVASION_TIME_US definition to a slightly > better place. I wish this could be hidden in intel_crtc.c but this is an improvement. Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx> > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_crtc.h | 10 ++++++++++ > drivers/gpu/drm/i915/display/intel_display_debugfs.c | 2 +- > drivers/gpu/drm/i915/display/intel_sprite.h | 10 ---------- > 3 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_crtc.h b/drivers/gpu/drm/i915/display/intel_crtc.h > index 73077137fb99..51a4c8df9e65 100644 > --- a/drivers/gpu/drm/i915/display/intel_crtc.h > +++ b/drivers/gpu/drm/i915/display/intel_crtc.h > @@ -16,6 +16,16 @@ struct intel_atomic_state; > struct intel_crtc; > struct intel_crtc_state; > > +/* > + * FIXME: We should instead only take spinlocks once for the entire update > + * instead of once per mmio. > + */ > +#if IS_ENABLED(CONFIG_PROVE_LOCKING) > +#define VBLANK_EVASION_TIME_US 250 > +#else > +#define VBLANK_EVASION_TIME_US 100 > +#endif > + > 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); > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > index abd16a2b1f7a..e72288662f02 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > @@ -12,6 +12,7 @@ > #include "i915_debugfs.h" > #include "i915_irq.h" > #include "i915_reg.h" > +#include "intel_crtc.h" > #include "intel_de.h" > #include "intel_crtc_state_dump.h" > #include "intel_display_debugfs.h" > @@ -30,7 +31,6 @@ > #include "intel_panel.h" > #include "intel_psr.h" > #include "intel_psr_regs.h" > -#include "intel_sprite.h" > #include "intel_wm.h" > > static inline struct drm_i915_private *node_to_i915(struct drm_info_node *node) > diff --git a/drivers/gpu/drm/i915/display/intel_sprite.h b/drivers/gpu/drm/i915/display/intel_sprite.h > index 4635c7ad23f9..91c6dca342b2 100644 > --- a/drivers/gpu/drm/i915/display/intel_sprite.h > +++ b/drivers/gpu/drm/i915/display/intel_sprite.h > @@ -16,16 +16,6 @@ struct intel_crtc_state; > struct intel_plane_state; > enum pipe; > > -/* > - * FIXME: We should instead only take spinlocks once for the entire update > - * instead of once per mmio. > - */ > -#if IS_ENABLED(CONFIG_PROVE_LOCKING) > -#define VBLANK_EVASION_TIME_US 250 > -#else > -#define VBLANK_EVASION_TIME_US 100 > -#endif > - > 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, -- Jani Nikula, Intel Open Source Graphics Center
