diff options
| author | Ville Syrjälä | 2015-06-24 21:00:03 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-06-29 10:55:05 +0200 |
| commit | 6eb1a6817246f1a67de4d6959a84d09efead5329 (patch) | |
| tree | ce1f064b3f93c2dd596782739f7351419a9e80ef /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Split atomic wm update to pre and post variants (diff) | |
| download | kernel-qcow2-linux-6eb1a6817246f1a67de4d6959a84d09efead5329.tar.gz kernel-qcow2-linux-6eb1a6817246f1a67de4d6959a84d09efead5329.tar.xz kernel-qcow2-linux-6eb1a6817246f1a67de4d6959a84d09efead5329.zip | |
drm/i915: Read wm values from hardware at init on CHV
Read out the current watermark settings from the hardware at driver init
time. This will allow us to compare the newly calculated values against
the currrent ones and potentially avoid needless WM updates.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Clint Taylor <Clinton.A.Taylor@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 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8024e7a30eed..2295f08ac0b6 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -15453,7 +15453,9 @@ void intel_modeset_setup_hw_state(struct drm_device *dev, pll->on = false; } - if (IS_GEN9(dev)) + if (IS_CHERRYVIEW(dev)) + vlv_wm_get_hw_state(dev); + else if (IS_GEN9(dev)) skl_wm_get_hw_state(dev); else if (HAS_PCH_SPLIT(dev)) ilk_wm_get_hw_state(dev); |