]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Convert hsw_compute_linetime_wm to use in-flight state
authorMatt Roper <matthew.d.roper@intel.com>
Thu, 3 Dec 2015 19:37:39 +0000 (11:37 -0800)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Wed, 6 Jan 2016 10:35:29 +0000 (11:35 +0100)
commit2db0ef883d3a2d36dcfed2e4a2e245a19df59bd9
tree12ba537b5801a7de403ef22c95ac3b921fa1e321
parente26e849d14383699fe39697f38b59ddb4b2f9f6c
drm/i915: Convert hsw_compute_linetime_wm to use in-flight state

When watermark calculation was moved up to the atomic check phase, the
code was updated to calculate based on in-flight atomic state rather
than already-committed state.  However the hsw_compute_linetime_wm()
didn't get updated and continued to pull values out of the
currently-committed CRTC state.  On platforms that call this function
(HSW/BDW only), this will cause problems when we go to enable the CRTC
since we'll pull the current mode (off) rather than the mode we're
calculating for and wind up with a divide by zero error.

This was an oversight in commit:

        commit a8270b62f545668aace709e55b7bfbdef32fc28b
        Author: Matt Roper <matthew.d.roper@intel.com>
        Date:   Thu Sep 24 15:53:16 2015 -0700

            drm/i915: Calculate ILK-style watermarks during atomic check (v3)

Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1449171462-30763-5-git-send-email-matthew.d.roper@intel.com
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
drivers/gpu/drm/i915/intel_pm.c