From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: use crtc_htotal when calculating ilk watermarks
Date: Wed, 8 Jan 2014 11:27:50 +0200 [thread overview]
Message-ID: <20140108092750.GI4800@intel.com> (raw)
In-Reply-To: <1387573680-2734-1-git-send-email-jbarnes@virtuousgeek.org>
On Fri, Dec 20, 2013 at 01:08:00PM -0800, Jesse Barnes wrote:
> This was introduced in:
>
> commit 7c4a395ff8f441acb7876281c6777624e6410349
> Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Date: Wed Oct 9 19:17:56 2013 +0300
>
> drm/i915: Don't re-compute pipe watermarks except for the affected pipe
git blame tells me the code has been like that since its introduction
in:
commit 801bcfffbb0721d7131e930f9a46103e539c43a4
Author: Paulo Zanoni <paulo.r.zanoni@intel.com>
Date: Fri May 31 10:08:35 2013 -0300
drm/i915: properly set HSW WM_PIPE registers
>
> and I missed fixing it in:
>
> commit fec8cba306f974f3a4491176994de5d821273643
> Author: Jesse Barnes <jbarnes@virtuousgeek.org>
> Date: Wed Nov 27 11:10:26 2013 -0800
>
> drm/i915: use crtc_htotal in watermark calculations to match fastboot v2
>
> It's needed for ILK+ platforms to fastboot without crashing on a divide
> by 0 after a DPMS on action.
>
> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
grep didn't find any more non-crtc_ values in intel_pm.c, so hopefully
we're now good.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 469170c..0f1efa4 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -2124,7 +2124,7 @@ static void ilk_compute_wm_parameters(struct drm_crtc *crtc,
>
> p->active = intel_crtc_active(crtc);
> if (p->active) {
> - p->pipe_htotal = intel_crtc->config.adjusted_mode.htotal;
> + p->pipe_htotal = intel_crtc->config.adjusted_mode.crtc_htotal;
> p->pixel_rate = ilk_pipe_pixel_rate(dev, crtc);
> p->pri.bytes_per_pixel = crtc->fb->bits_per_pixel / 8;
> p->cur.bytes_per_pixel = 4;
> --
> 1.7.9.5
--
Ville Syrjälä
Intel OTC
prev parent reply other threads:[~2014-01-08 9:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-20 21:08 [PATCH] drm/i915: use crtc_htotal when calculating ilk watermarks Jesse Barnes
2014-01-08 7:50 ` Daniel Vetter
2014-01-08 9:27 ` Ville Syrjälä [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=20140108092750.GI4800@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jbarnes@virtuousgeek.org \
/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