diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2013-12-05 17:51:38 +0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-12-17 16:17:56 +0400 |
| commit | 96f90c5421aaaba35ffd931728fabeb8f6cd8471 (patch) | |
| tree | 3842175affd2c8cb7c6cc37250656824f5f24ff2 /drivers/gpu/drm/i915/intel_display.c | |
| parent | 017636cc09e2c58bc493cc1fe74d858f50d173af (diff) | |
| download | linux-96f90c5421aaaba35ffd931728fabeb8f6cd8471.tar.xz | |
drm/i915: Move ILK/SNB/IVB over to the HSW WM code
The new HSW watermark code can now handle ILK/SNB/IVB as well, so
switch them over. Kill the old code.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 066fc9ddbd28..de5bbd791be5 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11230,7 +11230,7 @@ void intel_modeset_setup_hw_state(struct drm_device *dev, pll->on = false; } - if (IS_HASWELL(dev)) + if (HAS_PCH_SPLIT(dev)) ilk_wm_get_hw_state(dev); if (force_restore) { |