]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
drm/i915: Nuke skl_update_plane debug message from the pipe update critical section
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Wed, 8 Mar 2017 12:00:07 +0000 (13:00 +0100)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Thu, 9 Mar 2017 10:18:05 +0000 (11:18 +0100)
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 c331879ce8ea ("drm/i915:
skylake sprite plane scaling using shared scalers.") 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@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1488974407-25175-1-git-send-email-maarten.lankhorst@linux.intel.com
Fixes: c331879ce8ea ("drm/i915: skylake sprite plane scaling using shared scalers")
Cc: <stable@vger.kernel.org> # v4.2+
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
[mlankhorst: Add missing tags, point to the correct offending commit]

drivers/gpu/drm/i915/intel_sprite.c

index fee1efaba7d8b540598753d165a843bc9e9d1daa..300776b9e9354407c3709c7431e7cd44d93424f2 100644 (file)
@@ -275,9 +275,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),