]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Fix watermarks for VLV/CHV
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 9 Mar 2016 17:07:25 +0000 (19:07 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 10 Mar 2016 12:02:03 +0000 (14:02 +0200)
commit74718c0cfda2755a9dca615ff35969c4dbdc4a5a
tree58934a4a1a80d00a38d2c3edc07c53f299e5c7f0
parent58762ed1972713e7ad6c2262c47b1959f0e6cf4f
drm/i915: Fix watermarks for VLV/CHV

commit 2e4aaafbc304 ("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: 2e4aaafbc304 ("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>
drivers/gpu/drm/i915/intel_atomic.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h