From: Daniel Vetter <daniel@ffwll.ch>
To: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH v3] drm/i915/skl: Assume no scaling is available when things are not as expected
Date: Wed, 21 Oct 2015 08:45:24 +0200 [thread overview]
Message-ID: <20151021064524.GF13786@phenom.ffwll.local> (raw)
In-Reply-To: <1445357827-31015-1-git-send-email-tvrtko.ursulin@linux.intel.com>
On Tue, Oct 20, 2015 at 05:17:07PM +0100, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> Cdclk < crtc_clock is not allowed and suggests a different problem
> elsewhere in the code.
>
> It is more robust and safe to assume no scaling is possible in
> this case with no other downsides since it will also WARN_ON_ONCE
> so that this definitely gets noticed.
>
> Call it an assert to help new platform bring-up in simulation.
>
> v2: Better commit msg and use WARN_ON_ONCE to signify the unexpectedness.
>
> v3: Move zero crtc_clock check under the warn. (Ville)
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Queued for -next, thanks for the patch.
-Daniel
> ---
> drivers/gpu/drm/i915/intel_display.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 2981d09d5e4e..607a720c19ba 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -13436,7 +13436,7 @@ skl_max_scale(struct intel_crtc *intel_crtc, struct intel_crtc_state *crtc_state
> crtc_clock = crtc_state->base.adjusted_mode.crtc_clock;
> cdclk = to_intel_atomic_state(crtc_state->base.state)->cdclk;
>
> - if (!crtc_clock || !cdclk)
> + if (WARN_ON_ONCE(!crtc_clock || cdclk < crtc_clock))
> return DRM_PLANE_HELPER_NO_SCALING;
>
> /*
> --
> 1.9.1
>
> _______________________________________________
> 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
prev parent reply other threads:[~2015-10-21 6:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-20 15:01 [PATCH v2] drm/i915/skl: Assume no scaling is available when things are not as expected Tvrtko Ursulin
2015-10-20 15:25 ` Ville Syrjälä
2015-10-20 16:17 ` [PATCH v3] " Tvrtko Ursulin
2015-10-21 6:45 ` Daniel Vetter [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151021064524.GF13786@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=Intel-gfx@lists.freedesktop.org \
--cc=tvrtko.ursulin@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.