From patchwork Wed May 4 13:40:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lionel Landwerlin X-Patchwork-Id: 9014131 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 48348BF29F for ; Wed, 4 May 2016 13:40:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7461720397 for ; Wed, 4 May 2016 13:40:44 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 762F620395 for ; Wed, 4 May 2016 13:40:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 037F36E835; Wed, 4 May 2016 13:40:42 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 5469D6E835 for ; Wed, 4 May 2016 13:40:41 +0000 (UTC) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 04 May 2016 06:40:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,577,1455004800"; d="scan'208";a="968543831" Received: from petkovpa-mobl2.ger.corp.intel.com (HELO ivy.ger.corp.intel.com) ([10.252.55.200]) by orsmga002.jf.intel.com with ESMTP; 04 May 2016 06:40:38 -0700 From: Lionel Landwerlin To: intel-gfx@lists.freedesktop.org Date: Wed, 4 May 2016 14:40:34 +0100 Message-Id: <1462369234-27807-1-git-send-email-lionel.g.landwerlin@intel.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 MIME-Version: 1.0 Cc: Jani Nikula , Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: add missing condition for committing planes on crtc X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-6.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Fixes: 20a34e78f0d7 (drm/i915: Update color management during vblank evasion.) Cc: Maarten Lankhorst Cc: Jani Nikula Cc: Daniel Vetter Cc: Ville Syrjälä Signed-off-by: Lionel Landwerlin --- drivers/gpu/drm/i915/intel_display.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 45c218d..c6acfe5 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13688,6 +13688,11 @@ static int intel_atomic_commit(struct drm_device *dev, if (dev_priv->display.optimize_watermarks) dev_priv->display.optimize_watermarks(intel_cstate); + + if (crtc->state->color_mgmt_changed) { + intel_color_set_csc(crtc->state); + intel_color_load_luts(crtc->state); + } } for_each_crtc_in_state(state, crtc, old_crtc_state, i) {