diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2015-09-23 16:29:39 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-10-19 11:38:29 +0200 |
| commit | 6173ee2886ca46e00ba3d8f0b4a9a1cd6f8a76ce (patch) | |
| tree | 9f5802057332d096428bc976d6023bc4c385118e /drivers/gpu/drm/i915/intel_display.c | |
| parent | 6285262259ca3d12da57073236a55d1b81bf8643 (diff) | |
| download | lwn-6173ee2886ca46e00ba3d8f0b4a9a1cd6f8a76ce.tar.gz lwn-6173ee2886ca46e00ba3d8f0b4a9a1cd6f8a76ce.zip | |
drm/i915: Only call commit_planes when there are things to commit.
The atomic helpers set planes_changed on a crtc_state if there is
any plane_state bound to that crtc. If there's none and there is
no pipe update required the crtc has nothing to update, so vblank
evasion can be skipped.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index d5d00e929da2..b918802b1a42 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13153,7 +13153,8 @@ static int intel_atomic_commit(struct drm_device *dev, if (!modeset) intel_pre_plane_update(intel_crtc); - if (crtc->state->active) + if (crtc->state->active && + (crtc->state->planes_changed || update_pipe)) drm_atomic_helper_commit_planes_on_crtc(crtc_state); if (put_domains) |