| From bb7e32d588b7a57137b805adba274d7c845ee138 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> |
| Date: Fri, 9 Aug 2013 18:02:09 +0300 |
| Subject: drm/i915: Fix FB WM for HSW |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| 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> |
| (cherry picked from commit 5c536613d8ebda3da0448550d0a997651a6048e2) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_pm.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c |
| index 0f5eb217c707..4800bab89df1 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, |
| break; |
| max_level = level - 1; |
| |
| + memset(results, 0, sizeof(*results)); |
| + |
| /* The spec says it is preferred to disable FBC WMs instead of disabling |
| * a WM level. */ |
| results->enable_fbc_wm = true; |
| @@ -2691,7 +2693,6 @@ static void hsw_compute_wm_results(struct drm_device *dev, |
| } |
| } |
| |
| - memset(results, 0, sizeof(*results)); |
| for (wm_lp = 1; wm_lp <= 3; wm_lp++) { |
| const struct intel_wm_level *r; |
| |
| -- |
| 1.8.5.rc3 |
| |
