diff options
-rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index cdd78f69a28b..8064ff927bcc 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c | |||
@@ -2931,7 +2931,8 @@ static void haswell_update_wm(struct drm_crtc *crtc) | |||
2931 | ilk_wm_merge(dev, &max, &lp_wm_1_2); | 2931 | ilk_wm_merge(dev, &max, &lp_wm_1_2); |
2932 | 2932 | ||
2933 | /* 5/6 split only in single pipe config on IVB+ */ | 2933 | /* 5/6 split only in single pipe config on IVB+ */ |
2934 | if (INTEL_INFO(dev)->gen >= 7 && config.num_pipes_active == 1) { | 2934 | if (INTEL_INFO(dev)->gen >= 7 && |
2935 | config.num_pipes_active == 1 && config.sprites_enabled) { | ||
2935 | ilk_compute_wm_maximums(dev, 1, &config, INTEL_DDB_PART_5_6, &max); | 2936 | ilk_compute_wm_maximums(dev, 1, &config, INTEL_DDB_PART_5_6, &max); |
2936 | ilk_wm_merge(dev, &max, &lp_wm_5_6); | 2937 | ilk_wm_merge(dev, &max, &lp_wm_5_6); |
2937 | 2938 | ||