Skip to contentSkip to conversation

drm/i915: Make scaler updates less chatty

PATCH Applied Tvrtko Ursulin 5 participants 5 messages Nov 17, 2016

Subsystems (2)
lore
Share & tools
lore

Tvrtko Ursulin

author maintainer
#0 lore raw

PATCH 1/1 drm/i915: Make scaler updates less chatty

From: Tvrtko Ursulin <[email protected]>

It looks to me skl_update_scaler will already log interesting debug messages when the state transitions or there is an error.

In this case it feels we can remove the two unconditional debug messages which happen immediately before calling skl_update_scaler. This way we get rid of the sole debug message when switching virtual terminals for example.

---
 drivers/gpu/drm/i915/intel_display.c | 10 ----------
 1 file changed, 10 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -10
index 2ebb8b833395..cd5256c0b2d6 100644
@@ -4727,13 +4727,8 @@ skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach,
  */
 int skl_update_scaler_crtc(struct intel_crtc_state *state)
 {
-	struct intel_crtc *intel_crtc = to_intel_crtc(state->base.crtc);
 	const struct drm_display_mode *adjusted_mode = &state->base.adjusted_mode;
 
-	DRM_DEBUG_KMS("Updating scaler for [CRTC:%d:%s] scaler_user index %u.%u\n",
-		      intel_crtc->base.base.id, intel_crtc->base.name,
-		      intel_crtc->pipe, SKL_CRTC_INDEX);
-
 	return skl_update_scaler(state, !state->base.active, SKL_CRTC_INDEX,
 		&state->scaler_state.scaler_id, DRM_ROTATE_0,
 		state->pipe_src_w, state->pipe_src_h,
@@ -4754,7 +4749,6 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,
 				   struct intel_plane_state *plane_state)
 {
 
-	struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->base.crtc);
 	struct intel_plane *intel_plane =
 		to_intel_plane(plane_state->base.plane);
 	struct drm_framebuffer *fb = plane_state->base.fb;
@@ -4762,10 +4756,6 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,
 
 	bool force_detach = !fb || !plane_state->base.visible;
 
-	DRM_DEBUG_KMS("Updating scaler for [PLANE:%d:%s] scaler_user index %u.%u\n",
-		      intel_plane->base.base.id, intel_plane->base.name,
-		      intel_crtc->pipe, drm_plane_index(&intel_plane->base));
-
 	ret = skl_update_scaler(crtc_state, force_detach,
 				drm_plane_index(&intel_plane->base),
 				&plane_state->scaler_id,
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✓ Fi.CI.BAT: success for drm/i915: Make scaler updates less chatty

== Series Details ==

== Series Details ==

Series: drm/i915: Make scaler updates less chatty
URL : https://patchwork.freedesktop.org/series/15481/
State : success

== Summary ==

Series 15481v1 drm/i915: Make scaler updates less chatty
https://patchwork.freedesktop.org/api/1.0/series/15481/revisions/1/mbox/

fi-bdw-5557u     total:244  pass:229  dwarn:0   dfail:0   fail:0   skip:15 
fi-bsw-n3050     total:244  pass:204  dwarn:0   dfail:0   fail:0   skip:40 
fi-byt-j1900     total:244  pass:216  dwarn:0   dfail:0   fail:0   skip:28 
fi-byt-n2820     total:244  pass:212  dwarn:0   dfail:0   fail:0   skip:32 
fi-hsw-4770      total:244  pass:224  dwarn:0   dfail:0   fail:0   skip:20 
fi-hsw-4770r     total:244  pass:224  dwarn:0   dfail:0   fail:0   skip:20 
fi-ilk-650       total:244  pass:191  dwarn:0   dfail:0   fail:0   skip:53 
fi-ivb-3520m     total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 
fi-ivb-3770      total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 
fi-kbl-7200u     total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 
fi-skl-6260u     total:244  pass:230  dwarn:0   dfail:0   fail:0   skip:14 
fi-skl-6700hq    total:244  pass:223  dwarn:0   dfail:0   fail:0   skip:21 
fi-skl-6700k     total:244  pass:222  dwarn:1   dfail:0   fail:0   skip:21 
fi-skl-6770hq    total:244  pass:230  dwarn:0   dfail:0   fail:0   skip:14 
fi-snb-2520m     total:244  pass:212  dwarn:0   dfail:0   fail:0   skip:32 
fi-snb-2600      total:244  pass:211  dwarn:0   dfail:0   fail:0   skip:33 

ccd01198820ab7286f0b98f7b28dbf6ad29fa861 drm-intel-nightly: 2016y-11m-17d-10h-54m-57s UTC integration manifest e7b42bc drm/i915: Make scaler updates less chatty

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3032/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

Re: ✓ Fi.CI.BAT: success for drm/i915: Make scaler updates less chatty

Quoted 29 lines · Patchwork

== Series Details ==

Series: drm/i915: Make scaler updates less chatty
URL : https://patchwork.freedesktop.org/series/15481/
State : success

== Summary ==

Series 15481v1 drm/i915: Make scaler updates less chatty
https://patchwork.freedesktop.org/api/1.0/series/15481/revisions/1/mbox/

fi-bdw-5557u     total:244  pass:229  dwarn:0   dfail:0   fail:0   skip:15
fi-bsw-n3050     total:244  pass:204  dwarn:0   dfail:0   fail:0   skip:40
fi-byt-j1900     total:244  pass:216  dwarn:0   dfail:0   fail:0   skip:28
fi-byt-n2820     total:244  pass:212  dwarn:0   dfail:0   fail:0   skip:32
fi-hsw-4770      total:244  pass:224  dwarn:0   dfail:0   fail:0   skip:20
fi-hsw-4770r     total:244  pass:224  dwarn:0   dfail:0   fail:0   skip:20
fi-ilk-650       total:244  pass:191  dwarn:0   dfail:0   fail:0   skip:53
fi-ivb-3520m     total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22
fi-ivb-3770      total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22
fi-kbl-7200u     total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22
fi-skl-6260u     total:244  pass:230  dwarn:0   dfail:0   fail:0   skip:14
fi-skl-6700hq    total:244  pass:223  dwarn:0   dfail:0   fail:0   skip:21
fi-skl-6700k     total:244  pass:222  dwarn:1   dfail:0   fail:0   skip:21
fi-skl-6770hq    total:244  pass:230  dwarn:0   dfail:0   fail:0   skip:14
fi-snb-2520m     total:244  pass:212  dwarn:0   dfail:0   fail:0   skip:32
fi-snb-2600      total:244  pass:211  dwarn:0   dfail:0   fail:0   skip:33
Quoted 2 lines

ccd01198820ab7286f0b98f7b28dbf6ad29fa861 drm-intel-nightly: 2016y-11m-17d-10h-54m-57s UTC integration manifest e7b42bc drm/i915: Make scaler updates less chatty

Merged to dinq, thanks for the review!

Was also acked by Maarten on IRC.

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/1
#3 lore raw
In reply to Tvrtko Ursulin

Em Qui, 2016-11-17 às 10:00 +0000, Tvrtko Ursulin escreveu:

Quoted 9 lines

From: Tvrtko Ursulin <[email protected]>

It looks to me skl_update_scaler will already log interesting debug messages when the state transitions or there is an error.

In this case it feels we can remove the two unconditional debug messages which happen immediately before calling skl_update_scaler. This way we get rid of the sole debug message when switching virtual terminals for example.

I also got annoyed by this at some point.

Quoted 52 lines

---
 drivers/gpu/drm/i915/intel_display.c | 10 ----------

 1 file changed, 10 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -1
index 2ebb8b833395..cd5256c0b2d6 100644
@@ -4727,13 +4727,8 @@ skl_update_scaler(struct intel_crtc_state
 *crtc_state, bool force_detach,
   */
  int skl_update_scaler_crtc(struct intel_crtc_state *state)
  {
-	struct intel_crtc *intel_crtc = to_intel_crtc(state-
 >base.crtc);

  const struct drm_display_mode *adjusted_mode = &state-

Quoted 1 line

base.adjusted_mode;

drivers/gpu/drm/i915/intel_display.c +0 -1
-	DRM_DEBUG_KMS("Updating scaler for [CRTC:%d:%s] scaler_user

index %u.%u\n",

drivers/gpu/drm/i915/intel_display.c +0 -1
-		      intel_crtc->base.base.id, intel_crtc-
Quoted 1 line

base.name,

drivers/gpu/drm/i915/intel_display.c +0 -2
-		      intel_crtc->pipe, SKL_CRTC_INDEX);
-

  return skl_update_scaler(state, !state->base.active, SKL_CRTC_INDEX,
  &state->scaler_state.scaler_id, DRM_ROTATE_0, state->pipe_src_w, state->pipe_src_h,

drivers/gpu/drm/i915/intel_display.c +0 -0
@@ -4754,7 +4749,6 @@ static int skl_update_scaler_plane(struct
 intel_crtc_state *crtc_state,

     struct intel_plane_state *plane_state)
 {

drivers/gpu/drm/i915/intel_display.c +0 -1
-	struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state-
Quoted 1 line

base.crtc);

  struct intel_plane *intel_plane = to_intel_plane(plane_state->base.plane); struct drm_framebuffer *fb = plane_state->base.fb;

drivers/gpu/drm/i915/intel_display.c +0 -0
@@ -4762,10 +4756,6 @@ static int skl_update_scaler_plane(struct
 intel_crtc_state *crtc_state,


  bool force_detach = !fb || !plane_state->base.visible;

drivers/gpu/drm/i915/intel_display.c +0 -1
-	DRM_DEBUG_KMS("Updating scaler for [PLANE:%d:%s] scaler_user

index %u.%u\n",

drivers/gpu/drm/i915/intel_display.c +0 -1
-		      intel_plane->base.base.id, intel_plane-
Quoted 1 line

base.name,

drivers/gpu/drm/i915/intel_display.c +0 -1
-		      intel_crtc->pipe,
Quoted 5 lines

drm_plane_index(&intel_plane->base));
-
  ret = skl_update_scaler(crtc_state, force_detach, drm_plane_index(&intel_plane->base), &plane_state->scaler_id,

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by
#4 lore raw

Op 17-11-16 om 14:06 schreef Paulo Zanoni:

Quoted 64 lines

Em Qui, 2016-11-17 às 10:00 +0000, Tvrtko Ursulin escreveu:

Quoted 9 lines

From: Tvrtko Ursulin <[email protected]>

It looks to me skl_update_scaler will already log interesting debug messages when the state transitions or there is an error.

In this case it feels we can remove the two unconditional debug messages which happen immediately before calling skl_update_scaler. This way we get rid of the sole debug message when switching virtual terminals for example.

I also got annoyed by this at some point.

Quoted 50 lines
---
 drivers/gpu/drm/i915/intel_display.c | 10 ----------
 1 file changed, 10 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -2
index 2ebb8b833395..cd5256c0b2d6 100644
@@ -4727,13 +4727,8 @@ skl_update_scaler(struct intel_crtc_state
 *crtc_state, bool force_detach,
  */
 int skl_update_scaler_crtc(struct intel_crtc_state *state)
 {
-	struct intel_crtc *intel_crtc = to_intel_crtc(state-
 > base.crtc);
 	const struct drm_display_mode *adjusted_mode = &state-
 > base.adjusted_mode;
 
-	DRM_DEBUG_KMS("Updating scaler for [CRTC:%d:%s] scaler_user

index %u.%u\n",

drivers/gpu/drm/i915/intel_display.c +0 -1
-		      intel_crtc->base.base.id, intel_crtc-
Quoted 1 line

base.name,

drivers/gpu/drm/i915/intel_display.c +0 -2
-		      intel_crtc->pipe, SKL_CRTC_INDEX);
-
 	return skl_update_scaler(state, !state->base.active,

SKL_CRTC_INDEX,

drivers/gpu/drm/i915/intel_display.c +0 -1
 		&state->scaler_state.scaler_id, DRM_ROTATE_0,
 		state->pipe_src_w, state->pipe_src_h,
@@ -4754,7 +4749,6 @@ static int skl_update_scaler_plane(struct
 intel_crtc_state *crtc_state,
 				   struct intel_plane_state
 *plane_state)
 {
 
-	struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state-
 > base.crtc);
drivers/gpu/drm/i915/intel_display.c +0 -2
 	struct intel_plane *intel_plane =
 		to_intel_plane(plane_state->base.plane);
 	struct drm_framebuffer *fb = plane_state->base.fb;
@@ -4762,10 +4756,6 @@ static int skl_update_scaler_plane(struct
 intel_crtc_state *crtc_state,
 
 	bool force_detach = !fb || !plane_state->base.visible;
 
-	DRM_DEBUG_KMS("Updating scaler for [PLANE:%d:%s] scaler_user
 index %u.%u\n",
-		      intel_plane->base.base.id, intel_plane-
 > base.name,
Quoted 10 lines

drivers/gpu/drm/i915/intel_display.c static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state, · line 4761

Quoted 6 lines
drivers/gpu/drm/i915/intel_display.c +0 -1
-		      intel_crtc->pipe,

drm_plane_index(&intel_plane->base));

drivers/gpu/drm/i915/intel_display.c +0 -1
-
 	ret = skl_update_scaler(crtc_state, force_detach,
 				drm_plane_index(&intel_plane->base),
 				&plane_state->scaler_id,

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx