* [PATCH] drm/i915: remove excessive scaler debugging messages
@ 2015-08-14 12:59 Jani Nikula
2015-08-14 13:16 ` Daniel Vetter
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Jani Nikula @ 2015-08-14 12:59 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
There's so much scaler debugging messages that it makes other debugging
hard. Remove them.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_atomic.c | 3 ---
drivers/gpu/drm/i915/intel_display.c | 2 --
2 files changed, 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
index e2531cf59266..9336e8030980 100644
--- a/drivers/gpu/drm/i915/intel_atomic.c
+++ b/drivers/gpu/drm/i915/intel_atomic.c
@@ -149,9 +149,6 @@ int intel_atomic_setup_scalers(struct drm_device *dev,
int i, j;
num_scalers_need = hweight32(scaler_state->scaler_users);
- DRM_DEBUG_KMS("crtc_state = %p need = %d avail = %d scaler_users = 0x%x\n",
- crtc_state, num_scalers_need, intel_crtc->num_scalers,
- scaler_state->scaler_users);
/*
* High level flow:
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 21aa745caed1..52720ff9f769 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2935,8 +2935,6 @@ static void skl_detach_scaler(struct intel_crtc *intel_crtc, int id)
I915_WRITE(SKL_PS_CTRL(intel_crtc->pipe, id), 0);
I915_WRITE(SKL_PS_WIN_POS(intel_crtc->pipe, id), 0);
I915_WRITE(SKL_PS_WIN_SZ(intel_crtc->pipe, id), 0);
- DRM_DEBUG_KMS("CRTC:%d Disabled scaler id %u.%u\n",
- intel_crtc->base.base.id, intel_crtc->pipe, id);
}
/*
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915: remove excessive scaler debugging messages
2015-08-14 12:59 [PATCH] drm/i915: remove excessive scaler debugging messages Jani Nikula
@ 2015-08-14 13:16 ` Daniel Vetter
2015-08-16 16:14 ` shuang.he
2015-09-07 10:17 ` Tvrtko Ursulin
2 siblings, 0 replies; 4+ messages in thread
From: Daniel Vetter @ 2015-08-14 13:16 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Fri, Aug 14, 2015 at 03:59:53PM +0300, Jani Nikula wrote:
> There's so much scaler debugging messages that it makes other debugging
> hard. Remove them.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Queued for -next, thanks for the patch.
-Daniel
> ---
> drivers/gpu/drm/i915/intel_atomic.c | 3 ---
> drivers/gpu/drm/i915/intel_display.c | 2 --
> 2 files changed, 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
> index e2531cf59266..9336e8030980 100644
> --- a/drivers/gpu/drm/i915/intel_atomic.c
> +++ b/drivers/gpu/drm/i915/intel_atomic.c
> @@ -149,9 +149,6 @@ int intel_atomic_setup_scalers(struct drm_device *dev,
> int i, j;
>
> num_scalers_need = hweight32(scaler_state->scaler_users);
> - DRM_DEBUG_KMS("crtc_state = %p need = %d avail = %d scaler_users = 0x%x\n",
> - crtc_state, num_scalers_need, intel_crtc->num_scalers,
> - scaler_state->scaler_users);
>
> /*
> * High level flow:
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 21aa745caed1..52720ff9f769 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -2935,8 +2935,6 @@ static void skl_detach_scaler(struct intel_crtc *intel_crtc, int id)
> I915_WRITE(SKL_PS_CTRL(intel_crtc->pipe, id), 0);
> I915_WRITE(SKL_PS_WIN_POS(intel_crtc->pipe, id), 0);
> I915_WRITE(SKL_PS_WIN_SZ(intel_crtc->pipe, id), 0);
> - DRM_DEBUG_KMS("CRTC:%d Disabled scaler id %u.%u\n",
> - intel_crtc->base.base.id, intel_crtc->pipe, id);
> }
>
> /*
> --
> 2.1.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915: remove excessive scaler debugging messages
2015-08-14 12:59 [PATCH] drm/i915: remove excessive scaler debugging messages Jani Nikula
2015-08-14 13:16 ` Daniel Vetter
@ 2015-08-16 16:14 ` shuang.he
2015-09-07 10:17 ` Tvrtko Ursulin
2 siblings, 0 replies; 4+ messages in thread
From: shuang.he @ 2015-08-16 16:14 UTC (permalink / raw)
To: shuang.he, julianx.dumez, christophe.sureau, lei.a.liu, intel-gfx,
jani.nikula
Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 7202
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
ILK -2 302/302 300/302
SNB 315/315 315/315
IVB 336/336 336/336
BYT 283/283 283/283
HSW 378/378 378/378
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*ILK igt@kms_flip@flip-vs-dpms-interruptible PASS(1) DMESG_WARN(1)
*ILK igt@kms_flip@wf_vblank-vs-modeset-interruptible PASS(1) DMESG_WARN(1)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: remove excessive scaler debugging messages
2015-08-14 12:59 [PATCH] drm/i915: remove excessive scaler debugging messages Jani Nikula
2015-08-14 13:16 ` Daniel Vetter
2015-08-16 16:14 ` shuang.he
@ 2015-09-07 10:17 ` Tvrtko Ursulin
2 siblings, 0 replies; 4+ messages in thread
From: Tvrtko Ursulin @ 2015-09-07 10:17 UTC (permalink / raw)
To: Jani Nikula, intel-gfx
On 08/14/2015 01:59 PM, Jani Nikula wrote:
> There's so much scaler debugging messages that it makes other debugging
> hard. Remove them.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/intel_atomic.c | 3 ---
> drivers/gpu/drm/i915/intel_display.c | 2 --
> 2 files changed, 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
> index e2531cf59266..9336e8030980 100644
> --- a/drivers/gpu/drm/i915/intel_atomic.c
> +++ b/drivers/gpu/drm/i915/intel_atomic.c
> @@ -149,9 +149,6 @@ int intel_atomic_setup_scalers(struct drm_device *dev,
> int i, j;
>
> num_scalers_need = hweight32(scaler_state->scaler_users);
> - DRM_DEBUG_KMS("crtc_state = %p need = %d avail = %d scaler_users = 0x%x\n",
> - crtc_state, num_scalers_need, intel_crtc->num_scalers,
> - scaler_state->scaler_users);
>
> /*
> * High level flow:
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 21aa745caed1..52720ff9f769 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -2935,8 +2935,6 @@ static void skl_detach_scaler(struct intel_crtc *intel_crtc, int id)
> I915_WRITE(SKL_PS_CTRL(intel_crtc->pipe, id), 0);
> I915_WRITE(SKL_PS_WIN_POS(intel_crtc->pipe, id), 0);
> I915_WRITE(SKL_PS_WIN_SZ(intel_crtc->pipe, id), 0);
> - DRM_DEBUG_KMS("CRTC:%d Disabled scaler id %u.%u\n",
> - intel_crtc->base.base.id, intel_crtc->pipe, id);
> }
I had some patches for this, especially "[PATCH] drm/i915/skl: Only
disable scalers once" which I couldn't test properly due lack of
hardware. And "[PATCH] drm/i915/skl: Bypass debug message if scalers are
not requested", which only silences the case when scalers are not in
use, so yours may even be better.
But for the former, I think someone who knows this code should look at
my patch. To me it looks warranted to skip disabling scalers if they are
already disabled, rather than just kill the debug message.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-09-07 10:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-14 12:59 [PATCH] drm/i915: remove excessive scaler debugging messages Jani Nikula
2015-08-14 13:16 ` Daniel Vetter
2015-08-16 16:14 ` shuang.he
2015-09-07 10:17 ` Tvrtko Ursulin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox