[PATCH] drm/i915: Nuke skl_update_plane debug message from the pipe update critical section

Ville Syrjälä ville.syrjala at linux.intel.com
Wed Mar 8 13:12:18 UTC 2017


On Wed, Mar 08, 2017 at 01:00:07PM +0100, Maarten Lankhorst wrote:
> printks are slow so we should not be doing them from the vblank evade
> critical section. These could explain why we sometimes seem to
> blow past our 100 usec deadline.
> 
> The problem has been there ever since commit bfd16b2a23dc ("drm/i915:
> Make updating pipe without modeset atomic.")

I guess that part isn't actually true as far as this printk is
concerned?

Maybe commit 331879ce8ea ("drm/i915: skylake sprite plane scaling
using shared scalers")?

Anyways
Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

> but it may not have
> been readily visible until commit e1edbd44e23b ("drm/i915: Complain
> if we take too long under vblank evasion.") increased our chances
> of noticing it.
> 
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_sprite.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
> index 375ca91b308c..00da5a1ede82 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -271,9 +271,6 @@ skl_update_plane(struct drm_plane *drm_plane,
>  		int scaler_id = plane_state->scaler_id;
>  		const struct intel_scaler *scaler;
>  
> -		DRM_DEBUG_KMS("plane = %d PS_PLANE_SEL(plane) = 0x%x\n",
> -			      plane_id, PS_PLANE_SEL(plane_id));
> -
>  		scaler = &crtc_state->scaler_state.scalers[scaler_id];
>  
>  		I915_WRITE(SKL_PS_CTRL(pipe, scaler_id),
> -- 
> 2.7.4

-- 
Ville Syrjälä
Intel OTC


More information about the dri-devel mailing list