diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2016-03-09 20:07:25 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-08 04:23:41 +0300 |
commit | f5c446d7a152da038a5d3e85e3e6f3097fd21023 (patch) | |
tree | 789522436feee401315c7eb63b98fd480975dfc7 /arch/ia64/install.sh | |
parent | ccb46409376e6dde67453833cfcb6d950852fdec (diff) | |
download | linux-f5c446d7a152da038a5d3e85e3e6f3097fd21023.tar.xz |
drm/i915: Fix watermarks for VLV/CHV
commit caed361d83b204b7766924b80463bf7502ee7986 upstream.
commit 92826fcdfc14 ("drm/i915: Calculate watermark related members in the crtc_state, v4.")
broke thigns by removing the pre vs. post wm update distinction. We also
lost the pre plane wm update entirely for VLV/CHV from the crtc enable
path.
This caused underruns on modeset and plane enable/disable on CHV,
and often those can lead to a dead pipe.
So let's bring back the pre vs. post thing, and let's toss in an
explicit wm update to valleyview_crtc_enable() to avoid having to
put it into the common code.
This is more or less a partial revert of the offending commit.
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: drm-intel-fixes@lists.freedesktop.org
Fixes: 92826fcdfc14 ("drm/i915: Calculate watermark related members in the crtc_state, v4.")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1457543247-13987-4-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/ia64/install.sh')
0 files changed, 0 insertions, 0 deletions