]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: use crtc_htotal when calculating ilk watermarks
authorJesse Barnes <jbarnes@virtuousgeek.org>
Fri, 20 Dec 2013 21:08:00 +0000 (13:08 -0800)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 8 Jan 2014 09:40:50 +0000 (10:40 +0100)
commit81bf50cac8ec155e48426f7e5404e0515dab02c6
tree552c3863cc53d0f37fad685dd2d66f80b1d7cf20
parentcd6f206f3ecf3f76359c7a3f537065d0cde9749e
drm/i915: use crtc_htotal when calculating ilk watermarks

This was introduced in:

commit 568cf77b813be32b9b0f9d43fdf785987f80bcf6
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

and I missed fixing it in:

commit 1d33c1e46f9adffe9083d3e4f757711c52539d2b
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.

Note: Ville mentioned in his review that this confusion seems to go
down to the original introduction of this code in

commit c1059c077056daa241d7f1c79ea50bf6b5b587fe
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

So it seems to have been missed both in the fastboot patch and in the
3d mode suppport (where only crtc_htotal reflects the real pipe
width).

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
[danvet: Add note based on Ville's review.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_pm.c