diff options
| author | Pradeep Bhat | 2014-11-04 18:06:45 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-11-07 18:42:06 +0100 |
| commit | 3078999f2a4ee4aaabf9df2166e4e43581bb357a (patch) | |
| tree | 7844e3258867a936703dc29ab53b4fbb1e37bf0d /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915/skl: Program the DDB allocation (diff) | |
| download | kernel-qcow2-linux-3078999f2a4ee4aaabf9df2166e4e43581bb357a.tar.gz kernel-qcow2-linux-3078999f2a4ee4aaabf9df2166e4e43581bb357a.tar.xz kernel-qcow2-linux-3078999f2a4ee4aaabf9df2166e4e43581bb357a.zip | |
drm/i915/skl: Read the pipe WM HW state
This patch provides the implementation for reading the pipe wm HW
state.
v2: Incorporated Damien's review comments and also made modifications
to incorporate the plane/cursor split.
v3: No need to ident a line that was fitting 80 chars
Return early instead of indenting the remaining of a function
(Damien)
v4: Rebase on top of nightly (minor conflict in intel_drv.h)
v5: Rebase on top of nightly (minor conflict in intel_drv.h)
v6: Rebase on top of nightly (minor conflict in intel_drv.h)
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Pradeep Bhat <pradeep.bhat@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@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 84f4f0504bbb..01bc55850070 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13266,7 +13266,9 @@ void intel_modeset_setup_hw_state(struct drm_device *dev, pll->on = false; } - if (HAS_PCH_SPLIT(dev)) + if (IS_GEN9(dev)) + skl_wm_get_hw_state(dev); + else if (HAS_PCH_SPLIT(dev)) ilk_wm_get_hw_state(dev); if (force_restore) { |