aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2013-08-09 11:02:09 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-08-09 14:27:43 -0400
commit5c536613d8ebda3da0448550d0a997651a6048e2 (patch)
tree76897bf8038b61c3ea411eee6324f3cb831440d1
parent6f6005a52b79c2b2e3d58d8ab63791c378ebf82c (diff)
drm/i915: Fix FB WM for HSW
Due to a misplaced memset(), we never actually enabled the FBC WM on HSW. Move the memset() to happen a bit earlier, so that it won't clobber results->enable_fbc_wm. 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>
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c3
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 6643069eccdb..3ac5fe9d428a 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -2681,6 +2681,8 @@ static void hsw_compute_wm_results(struct drm_device *dev,
2681 break; 2681 break;
2682 max_level = level - 1; 2682 max_level = level - 1;
2683 2683
2684 memset(results, 0, sizeof(*results));
2685
2684 /* The spec says it is preferred to disable FBC WMs instead of disabling 2686 /* The spec says it is preferred to disable FBC WMs instead of disabling
2685 * a WM level. */ 2687 * a WM level. */
2686 results->enable_fbc_wm = true; 2688 results->enable_fbc_wm = true;
@@ -2691,7 +2693,6 @@ static void hsw_compute_wm_results(struct drm_device *dev,
2691 } 2693 }
2692 } 2694 }
2693 2695
2694 memset(results, 0, sizeof(*results));
2695 for (wm_lp = 1; wm_lp <= 3; wm_lp++) { 2696 for (wm_lp = 1; wm_lp <= 3; wm_lp++) {
2696 const struct intel_wm_level *r; 2697 const struct intel_wm_level *r;
2697 2698