Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp8143846ybi; Thu, 6 Jun 2019 07:25:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqzzYHMvS1+73sqW7JATVh+xgakhYIIuipfrrSIF3xbcBTyawSvOkPMLZrFtfi0nSn/X/KCW X-Received: by 2002:a63:1c59:: with SMTP id c25mr3553522pgm.395.1559831126462; Thu, 06 Jun 2019 07:25:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559831126; cv=none; d=google.com; s=arc-20160816; b=M20PjEMQ8GJRgJswcv59VYqJEIE0EORv9zFth8T7Bl8618ZZRKaawO9aVPQQIh1nw1 ZaWmfJiTTwDReJq8Yk/Cvu0Xu+uIuC9pQHULGLZgRqMbfdIvxWHbOUaf9ABfFz4X8P8x fX8YtKuEGBDBr7A2iUKeS1RnmcN3lhtaH/rJpOzbxOpoHGrLrB9V6If+Nr46vzZVS0dX lGelB+Nl8GRfOWh0v39dQuw0Zh6p9s9XXd3x4mUBWYzr5v6wcEqG5VC57hNL9FZr/frN 1I2wJa4at+1LE9K+mWeXGaFfU+UlBupifL35TUrNajlzcGQ89wfSyl6ycgh+dy1NX0k9 2I7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=i9yxZXlSaUNHy7TGijcxJC04Jn6l5DlOPzyyRbx6ArI=; b=0aO51E+kCpT8EThu1cMeODK3aPz1fXDhUwwBVH+Xyz/SALs3+QyVbiUBjWb9jSVaC9 lC6dcnvgp+FlnTFOC6rsOZ+BUJ+G6A4zcHPkT2JOLZ8oB4CMHmVdgcWSthh+v7gfw6ti M+NgLgnA4O+RT7rC6xwl1ymZC7dL2S5wmrJSEUnJla2vSJ33aqAokfuFbhFVVxnLQ+Kr TOeHxCCFnIQxoMenEpvPs0Ex5dD7+5TATTStXTt8ElgP4vIQibWkAXzz8matGnxOD9Mf PoFimzYu1rtzdAIk1EyW2biQmiGS9urgrHmWhb3MT4GttLgjt1m9MG1SCMYAZKJXTZlu Zh7Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m145si2018246pfd.217.2019.06.06.07.25.09; Thu, 06 Jun 2019 07:25:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729013AbfFFOWX (ORCPT + 99 others); Thu, 6 Jun 2019 10:22:23 -0400 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:32887 "EHLO relay7-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728824AbfFFOWV (ORCPT ); Thu, 6 Jun 2019 10:22:21 -0400 X-Originating-IP: 2.224.242.101 Received: from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101]) (Authenticated sender: jacopo@jmondi.org) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id B6B5120014; Thu, 6 Jun 2019 14:22:17 +0000 (UTC) From: Jacopo Mondi To: laurent.pinchart@ideasonboard.com, kieran.bingham+renesas@ideasonboard.com, airlied@linux.ie, daniel@ffwll.ch Cc: Jacopo Mondi , koji.matsuoka.xm@renesas.com, muroya@ksk.co.jp, VenkataRajesh.Kalakodima@in.bosch.com, Harsha.ManjulaMallikarjun@in.bosch.com, linux-renesas-soc@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 17/20] drm: rcar-du: crtc: Enable and disable CMMs Date: Thu, 6 Jun 2019 16:22:17 +0200 Message-Id: <20190606142220.1392-18-jacopo+renesas@jmondi.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190606142220.1392-1-jacopo+renesas@jmondi.org> References: <20190606142220.1392-1-jacopo+renesas@jmondi.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Enable/disable the CMM associated with a CRTC at atomic_enable()/atomic_disable() time. Signed-off-by: Jacopo Mondi --- drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c index 9f270a54b164..e6d3df37c827 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c @@ -21,6 +21,7 @@ #include #include +#include "rcar_cmm.h" #include "rcar_du_crtc.h" #include "rcar_du_drv.h" #include "rcar_du_encoder.h" @@ -523,6 +524,7 @@ static int rcar_du_crtc_get(struct rcar_du_crtc *rcrtc) goto error_group; rcar_du_crtc_setup(rcrtc); + rcrtc->initialized = true; return 0; @@ -619,6 +621,9 @@ static void rcar_du_crtc_stop(struct rcar_du_crtc *rcrtc) if (rcar_du_has(rcrtc->dev, RCAR_DU_FEATURE_VSP1_SOURCE)) rcar_du_vsp_disable(rcrtc); + if (rcar_du_has(rcrtc->dev, RCAR_DU_FEATURE_CMM) && rcrtc->cmm) + rcar_cmm_disable(rcrtc->cmm); + /* * Select switch sync mode. This stops display operation and configures * the HSYNC and VSYNC signals as inputs. @@ -686,6 +691,9 @@ static void rcar_du_crtc_atomic_enable(struct drm_crtc *crtc, } rcar_du_crtc_start(rcrtc); + + if (rcar_du_has(rcrtc->dev, RCAR_DU_FEATURE_CMM) && rcrtc->cmm) + rcar_cmm_enable(rcrtc->cmm); } static void rcar_du_crtc_atomic_disable(struct drm_crtc *crtc, -- 2.21.0