summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorThomas Daniel <thomas.daniel@intel.com>2015-10-23 15:55:38 +0200
committerJani Nikula <jani.nikula@intel.com>2015-10-27 14:46:47 +0100
commit5a37ed0a9eda5fd77a4cc92c6e46b6f6e8db873d (patch)
tree2e5ed3086e551bc30b0325854dc8ea96349d69c7 /drivers
parentdrm/i915: add hotplug activation period to hotplug update mask (diff)
downloadlinux-5a37ed0a9eda5fd77a4cc92c6e46b6f6e8db873d.tar.xz
linux-5a37ed0a9eda5fd77a4cc92c6e46b6f6e8db873d.zip
drm/i915: Fix maxfifo watermark calc on vlv cursor planes
A typo resulted in the watermarks for cursor planes not being calculated correctly. Fixed the typo. Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Thomas Daniel <thomas.daniel@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 9dda3eaebd12..80175a38a875 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -1135,7 +1135,7 @@ static void vlv_compute_wm(struct intel_crtc *crtc)
case DRM_PLANE_TYPE_CURSOR:
for (level = 0; level < wm_state->num_levels; level++)
wm_state->sr[level].cursor =
- wm_state->sr[level].cursor;
+ wm_state->wm[level].cursor;
break;
case DRM_PLANE_TYPE_PRIMARY:
for (level = 0; level < wm_state->num_levels; level++)