aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 9f1ee07ec4ae..cdd70e654af5 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -1286,6 +1286,7 @@ static void valleyview_update_wm(struct drm_device *dev)
1286 struct drm_i915_private *dev_priv = dev->dev_private; 1286 struct drm_i915_private *dev_priv = dev->dev_private;
1287 int planea_wm, planeb_wm, cursora_wm, cursorb_wm; 1287 int planea_wm, planeb_wm, cursora_wm, cursorb_wm;
1288 int plane_sr, cursor_sr; 1288 int plane_sr, cursor_sr;
1289 int ignore_plane_sr, ignore_cursor_sr;
1289 unsigned int enabled = 0; 1290 unsigned int enabled = 0;
1290 1291
1291 vlv_update_drain_latency(dev); 1292 vlv_update_drain_latency(dev);
@@ -1308,7 +1309,12 @@ static void valleyview_update_wm(struct drm_device *dev)
1308 sr_latency_ns, 1309 sr_latency_ns,
1309 &valleyview_wm_info, 1310 &valleyview_wm_info,
1310 &valleyview_cursor_wm_info, 1311 &valleyview_cursor_wm_info,
1311 &plane_sr, &cursor_sr)) 1312 &plane_sr, &ignore_cursor_sr) &&
1313 g4x_compute_srwm(dev, ffs(enabled) - 1,
1314 2*sr_latency_ns,
1315 &valleyview_wm_info,
1316 &valleyview_cursor_wm_info,
1317 &ignore_plane_sr, &cursor_sr))
1312 I915_WRITE(FW_BLC_SELF_VLV, FW_CSPWRDWNEN); 1318 I915_WRITE(FW_BLC_SELF_VLV, FW_CSPWRDWNEN);
1313 else 1319 else
1314 I915_WRITE(FW_BLC_SELF_VLV, 1320 I915_WRITE(FW_BLC_SELF_VLV,