| From a387a082e8b46f08ecdb3fc3f5c514a9c070e9f6 Mon Sep 17 00:00:00 2001 |
| From: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Date: Fri, 3 May 2013 17:23:39 -0300 |
| Subject: drm/i915: use the mode->htotal to calculate linetime watermarks |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| ... instead of mode->crtc_display. The spec says "pipe horizontal |
| total number of pixels" and the "Haswell Watermark Calculator" tool |
| uses the "Pipe H Total" instead of "Pipe H Src" as the value. |
| |
| Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit 7366937312d4e406539b1cf70e1562358bdd560e) |
| Signed-off-by: Darren Hart <dvhart@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 e8505e8cd711..9f336991fee7 100644 |
| --- a/drivers/gpu/drm/i915/intel_pm.c |
| +++ b/drivers/gpu/drm/i915/intel_pm.c |
| @@ -2093,7 +2093,7 @@ haswell_update_linetime_wm(struct drm_device *dev, struct drm_crtc *crtc) |
| * row at the given clock rate, multiplied by 8. |
| * */ |
| temp |= PIPE_WM_LINETIME_TIME( |
| - ((mode->crtc_hdisplay * 1000) / mode->clock) * 8); |
| + ((mode->htotal * 1000) / mode->clock) * 8); |
| |
| /* IPS watermarks are only used by pipe A, and are ignored by |
| * pipes B and C. They are calculated similarly to the common |
| -- |
| 1.8.5.rc3 |
| |
