diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2013-10-14 14:55:24 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-10-15 19:01:24 +0200 |
| commit | 243e6a44b9ca5aa3c9ce47459a53e03b1dc7e665 (patch) | |
| tree | eb9b3817e8aeb1559327c4ba9291fe66b83b890d /drivers/gpu/drm/i915/intel_display.c | |
| parent | 49a687c471396d063bb3d3cf04d62568efe7ec5e (diff) | |
| download | blackbird-op-linux-243e6a44b9ca5aa3c9ce47459a53e03b1dc7e665.tar.gz blackbird-op-linux-243e6a44b9ca5aa3c9ce47459a53e03b1dc7e665.zip | |
drm/i915: Init HSW watermark tracking in intel_modeset_setup_hw_state()
Fill out the HSW watermark s/w tracking structures with the current
hardware state in intel_modeset_setup_hw_state(). This allows us to skip
the HW state readback during watermark programming and just use the values
we keep around in dev_priv->wm. Reduces the overhead of the watermark
programming quite a bit.
v2: s/init_wm/wm_get_hw_state
Remove stale comment about sprites
Make DDB partitioning readout safer
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Fix whitespace fail.]
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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index e6a4ca16f33c..53ad5cb9e802 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10839,6 +10839,9 @@ void intel_modeset_setup_hw_state(struct drm_device *dev, pll->on = false; } + if (IS_HASWELL(dev)) + ilk_wm_get_hw_state(dev); + if (force_restore) { i915_redisable_vga(dev); |
