From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 2/6] drm/i915: Do not wait atomically for display clocks
Date: Mon, 1 Feb 2016 18:58:34 +0200 [thread overview]
Message-ID: <20160201165834.GR23290@intel.com> (raw)
In-Reply-To: <1454344071-15881-2-git-send-email-tvrtko.ursulin@linux.intel.com>
On Mon, Feb 01, 2016 at 04:27:47PM +0000, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> Looks like this code does not need to wait atomically since it
> otherwise takes the mutex. But did it rely on on the requested
> 1us wait actually being up to 1ms?
Bspec says 1 us, so it *should* be fine.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 304fc9637026..a7530cf612d7 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -9753,8 +9753,8 @@ static void broadwell_set_cdclk(struct drm_device *dev, int cdclk)
> val |= LCPLL_CD_SOURCE_FCLK;
> I915_WRITE(LCPLL_CTL, val);
>
> - if (wait_for_atomic_us(I915_READ(LCPLL_CTL) &
> - LCPLL_CD_SOURCE_FCLK_DONE, 1))
> + if (wait_for_us(I915_READ(LCPLL_CTL) &
> + LCPLL_CD_SOURCE_FCLK_DONE, 1))
> DRM_ERROR("Switching to FCLK failed\n");
>
> val = I915_READ(LCPLL_CTL);
> @@ -9788,8 +9788,8 @@ static void broadwell_set_cdclk(struct drm_device *dev, int cdclk)
> val &= ~LCPLL_CD_SOURCE_FCLK;
> I915_WRITE(LCPLL_CTL, val);
>
> - if (wait_for_atomic_us((I915_READ(LCPLL_CTL) &
> - LCPLL_CD_SOURCE_FCLK_DONE) == 0, 1))
> + if (wait_for_us((I915_READ(LCPLL_CTL) &
> + LCPLL_CD_SOURCE_FCLK_DONE) == 0, 1))
> DRM_ERROR("Switching back to LCPLL failed\n");
>
> mutex_lock(&dev_priv->rps.hw_lock);
> --
> 1.9.1
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-02-01 16:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-01 16:27 [PATCH 1/6] drm/i915: Add wait_for_us Tvrtko Ursulin
2016-02-01 16:27 ` [PATCH 2/6] drm/i915: Do not wait atomically for display clocks Tvrtko Ursulin
2016-02-01 16:58 ` Ville Syrjälä [this message]
2016-02-01 16:27 ` [PATCH 3/6] drm/i915/guc: Do not wait for firmware load atomically Tvrtko Ursulin
2016-02-01 16:27 ` [PATCH 4/6] drm/i915/lrc: Do not wait atomically when stopping engines Tvrtko Ursulin
2016-02-01 16:27 ` [PATCH 5/6] drm/i915: Kconfig for extra driver debugging Tvrtko Ursulin
2016-02-02 9:18 ` Jani Nikula
2016-02-02 9:32 ` Tvrtko Ursulin
2016-02-02 9:40 ` Jani Nikula
2016-02-02 11:09 ` Tvrtko Ursulin
2016-02-01 16:27 ` [PATCH 6/6] drm/i915: Do not lie about atomic wait granularity Tvrtko Ursulin
2016-02-01 16:45 ` ✓ Fi.CI.BAT: success for series starting with [1/6] drm/i915: Add wait_for_us Patchwork
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=20160201165834.GR23290@intel.com \
--to=ville.syrjala@linux.intel.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).