[PATCH] drm/i915: add missing condition for committing planes on crtc

Lionel Landwerlin
2016-05-09T14:40:20Z

We are currently missing the color management update condition to
commit planes on crtc.

v2: add comment about moving the commit of color management registers
to an async worker

v3: Commit color management register right after vblank

v4: Move back color management commit condition together with planes
commit

Fixes: 20a34e78f0d7 (drm/i915: Update color management during vblank evasion.)
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 3c6b7b9..b63f33d 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -13669,7 +13669,9 @@ static int intel_atomic_commit(struct drm_device *dev,
intel_fbc_enable(intel_crtc);

if (crtc->state->active &&
- (crtc->state->planes_changed || update_pipe))
+ (crtc->state->planes_changed ||
+ crtc->state->color_mgmt_changed ||
+ update_pipe))
drm_atomic_helper_commit_planes_on_crtc(old_crtc_state);

if (pipe_config->base.active && needs_vblank_wait(pipe_config))
--
2.8.0.rc3.226.g39d4020