diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2013-10-11 15:26:26 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-10-15 10:13:22 +0200 |
| commit | a5db6b62577b14a9fbe639af0aba9ec7ae85ae3e (patch) | |
| tree | 358c073a3d91cc857059d405212aa98379368745 /drivers/gpu/drm/i915/intel_pm.c | |
| parent | a485bfb8d0d70ba24662aab5e00b2914c646220b (diff) | |
| download | blackbird-obmc-linux-a5db6b62577b14a9fbe639af0aba9ec7ae85ae3e.tar.gz blackbird-obmc-linux-a5db6b62577b14a9fbe639af0aba9ec7ae85ae3e.zip | |
drm/i915: Check 5/6 DDB split only when sprites are enabled
Using the 5/6 DDB split make sense only when sprites are enabled.
So check that before we waste any cycles computing the merged
watermarks with the 5/6 DDB split.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 2 |
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 3d3f1134f16b..a5503cd7a1c8 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -2900,7 +2900,7 @@ static void haswell_update_wm(struct drm_crtc *crtc) ilk_wm_merge(dev, &max, &lp_wm_1_2); /* 5/6 split only in single pipe config on IVB+ */ - if (INTEL_INFO(dev)->gen >= 7 && config.num_pipes_active <= 1) { + if (INTEL_INFO(dev)->gen >= 7 && config.num_pipes_active == 1) { ilk_wm_max(dev, 1, &config, INTEL_DDB_PART_5_6, &max); ilk_wm_merge(dev, &max, &lp_wm_5_6); |
