[PATCH 14/16] Revert "debug"
José Roberto de Souza
jose.souza at intel.com
Tue Sep 28 23:52:57 UTC 2021
This reverts commit 5904f4015348e2c2cef6844d1b26e133a109b622.
---
drivers/gpu/drm/i915/display/intel_cursor.c | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c
index 69c2103686237..b74946b635cf7 100644
--- a/drivers/gpu/drm/i915/display/intel_cursor.c
+++ b/drivers/gpu/drm/i915/display/intel_cursor.c
@@ -629,8 +629,6 @@ intel_legacy_cursor_update(struct drm_plane *_plane,
struct intel_crtc_state *new_crtc_state;
int ret;
- drm_info(_plane->dev, "intel_legacy_cursor_update\n");
-
/*
* When crtc is inactive or there is a modeset pending,
* wait for it to complete in the slowpath.
@@ -641,10 +639,8 @@ intel_legacy_cursor_update(struct drm_plane *_plane,
* FIXME bigjoiner fastpath would be good
*/
if (!crtc_state->hw.active || intel_crtc_needs_modeset(crtc_state) ||
- crtc_state->update_pipe || crtc_state->bigjoiner) {
- drm_info(_plane->dev, "\tslow one\n");
+ crtc_state->update_pipe || crtc_state->bigjoiner)
goto slow;
- }
/*
* Don't do an async update if there is an outstanding commit modifying
@@ -652,10 +648,8 @@ intel_legacy_cursor_update(struct drm_plane *_plane,
* overridden by a previous synchronous update's state.
*/
if (old_plane_state->uapi.commit &&
- !try_wait_for_completion(&old_plane_state->uapi.commit->hw_done)) {
- drm_info(_plane->dev, "\tslow two\n");
+ !try_wait_for_completion(&old_plane_state->uapi.commit->hw_done))
goto slow;
- }
/*
* If any parameters change that may affect watermarks,
@@ -667,10 +661,8 @@ intel_legacy_cursor_update(struct drm_plane *_plane,
old_plane_state->uapi.src_h != src_h ||
old_plane_state->uapi.crtc_w != crtc_w ||
old_plane_state->uapi.crtc_h != crtc_h ||
- !old_plane_state->uapi.fb != !fb) {
- drm_info(_plane->dev, "\tslow three\n");
+ !old_plane_state->uapi.fb != !fb)
goto slow;
- }
new_plane_state = to_intel_plane_state(intel_plane_duplicate_state(&plane->base));
if (!new_plane_state)
@@ -739,11 +731,9 @@ intel_legacy_cursor_update(struct drm_plane *_plane,
intel_plane_destroy_state(&plane->base, &new_plane_state->uapi);
else
intel_plane_destroy_state(&plane->base, &old_plane_state->uapi);
- drm_info(_plane->dev, "\tfast\n");
return ret;
slow:
- drm_info(_plane->dev, "\tslow\n");
return drm_atomic_helper_update_plane(&plane->base, &crtc->base, fb,
crtc_x, crtc_y, crtc_w, crtc_h,
src_x, src_y, src_w, src_h, ctx);
--
2.33.0
More information about the Intel-gfx-trybot
mailing list