aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorImre Deak <imre.deak@intel.com>2013-12-17 07:46:34 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-12-17 13:22:00 -0500
commit954911ebb1cb5c965a127ec9c0fc86c069c71cf9 (patch)
tree4b415d1e1c4adc56ad69db68d56abf3c462fa3ec /drivers/gpu/drm
parent8368f0148fa95fb5720e0fbeb4a91d738f06a4b4 (diff)
drm/i915: simplify platform specific code in hsw_write_wm_values
No functional change. Signed-off-by: Imre Deak <imre.deak@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')
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index ecdb64e44e2a..9c33835e96f9 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -2515,12 +2515,11 @@ static void hsw_write_wm_values(struct drm_i915_private *dev_priv,
2515 I915_WRITE(DISP_ARB_CTL, val); 2515 I915_WRITE(DISP_ARB_CTL, val);
2516 } 2516 }
2517 2517
2518 if (INTEL_INFO(dev)->gen <= 6) { 2518 if (dirty & WM_DIRTY_LP(1) &&
2519 if (dirty & WM_DIRTY_LP(1) && previous->wm_lp_spr[0] != results->wm_lp_spr[0]) 2519 previous->wm_lp_spr[0] != results->wm_lp_spr[0])
2520 I915_WRITE(WM1S_LP_ILK, results->wm_lp_spr[0]); 2520 I915_WRITE(WM1S_LP_ILK, results->wm_lp_spr[0]);
2521 } else { 2521
2522 if (dirty & WM_DIRTY_LP(1) && previous->wm_lp_spr[0] != results->wm_lp_spr[0]) 2522 if (INTEL_INFO(dev)->gen >= 7) {
2523 I915_WRITE(WM1S_LP_ILK, results->wm_lp_spr[0]);
2524 if (dirty & WM_DIRTY_LP(2) && previous->wm_lp_spr[1] != results->wm_lp_spr[1]) 2523 if (dirty & WM_DIRTY_LP(2) && previous->wm_lp_spr[1] != results->wm_lp_spr[1])
2525 I915_WRITE(WM2S_LP_IVB, results->wm_lp_spr[1]); 2524 I915_WRITE(WM2S_LP_IVB, results->wm_lp_spr[1]);
2526 if (dirty & WM_DIRTY_LP(3) && previous->wm_lp_spr[2] != results->wm_lp_spr[2]) 2525 if (dirty & WM_DIRTY_LP(3) && previous->wm_lp_spr[2] != results->wm_lp_spr[2])