diff options
| author | Ville Syrjälä | 2016-11-28 18:37:04 +0100 |
|---|---|---|
| committer | Ville Syrjälä | 2016-12-05 15:23:24 +0100 |
| commit | ddd2b792cc942adfc31288dabf5d22886c31193f (patch) | |
| tree | 1954e3c9d3c43d59813e3ed1fbdacd4265b26263 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Drop the nop intel_update_watermarks() call from haswell_crtc_enable() (diff) | |
| download | kernel-qcow2-linux-ddd2b792cc942adfc31288dabf5d22886c31193f.tar.gz kernel-qcow2-linux-ddd2b792cc942adfc31288dabf5d22886c31193f.tar.xz kernel-qcow2-linux-ddd2b792cc942adfc31288dabf5d22886c31193f.zip | |
drm/i915: Use the ilk_disable_lp_wm() return value
ilk_disable_lp_wm() will tell us whether the LP1+ watermarks were
disabled or not, and hence whether we need to for the vblank wait or
not. Let's use that information to eliminate some useless vblank
waits.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1480354637-14209-3-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index b01faf50fe42..1f7d91af60cf 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5114,10 +5114,8 @@ static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state) * * WaCxSRDisabledForSpriteScaling:ivb */ - if (pipe_config->disable_lp_wm) { - ilk_disable_lp_wm(dev); + if (pipe_config->disable_lp_wm && ilk_disable_lp_wm(dev)) intel_wait_for_vblank(dev_priv, crtc->pipe); - } /* * If we're doing a modeset, we're done. No need to do any pre-vblank |