From patchwork Mon Jan 22 09:25:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 125354 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp1053847ljf; Mon, 22 Jan 2018 01:25:59 -0800 (PST) X-Google-Smtp-Source: AH8x2255b2pdV/WhbRGqX8Fznx5ZhCYOqrini9zmpcNzYTSMEaHNxMEhl/J59lQZ5TYeHlF/wiNO X-Received: by 10.101.88.66 with SMTP id s2mr6895826pgr.341.1516613158943; Mon, 22 Jan 2018 01:25:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516613158; cv=none; d=google.com; s=arc-20160816; b=0YBBer361XwejCwhjBB+nFu+QFQFmPb5m41pVa10OPA+8Af7e3Xf+/G/9zmK4T52lO 58g4NHenYw1JaAZRp+l9Sf9HF1aD/wga3SizESUe5veHGnJSxDUTPF3ds6HHiXbo+xhj D/9aL46zQSrYR4alwhL/rVVGHkTMznYZCrwQ4Urirm2ZkqJH0OCjVYOvNvBx5QYN1n+E p5HFreAamiHzm/F6+00MT4I6tVrarTd+bWIL8mAlF8kVdgvZUzU31nLRSFFFkv2xSyqS ESzvTjJQxtLYuLjQI+p/RXjwLWhxYYft2OjeZ7xix+UYLFUlgmjSXTroLabDEdVbHQpP mfTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=vBJGYxRU6gIxAG1eliN3uiwMRvVzty3LNTFchH6KiCU=; b=JaEkkRdzHkQLDwQjpTfJcUNRAbC+x7Zq2PBAx0fC0DRHgcMVPzVO9dPd5yIurvJ0/o XWoz3GD7c+vWSJ8GfMpH/kT94iLywda2dPYanZV46x1lXfIMhhLTLqFLm+oC92pARUNp +HpeKV96+wtQiJS/lEp2Z9h032xfeYDhKDtdOoxTEsjRDaro2Vl3bBG97yuqIuswj6ra qTdUubTUhnf4iyO+XxqO44F9B82PueW2tIVeknKjIcWDLbmb8oLgJQRADtJjDn27x92g UDbQvjtCRx2OyDtdDmYtsjxi82XDM6Z+zbkkhe4nS2wtDqVsybXzyhTQEn09JPvZYxxx +bAg== 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 f9-v6si3236173plm.183.2018.01.22.01.25.58; Mon, 22 Jan 2018 01:25:58 -0800 (PST) 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 S1752292AbeAVJZ4 (ORCPT + 28 others); Mon, 22 Jan 2018 04:25:56 -0500 Received: from mail.free-electrons.com ([62.4.15.54]:44119 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752024AbeAVJZu (ORCPT ); Mon, 22 Jan 2018 04:25:50 -0500 Received: by mail.free-electrons.com (Postfix, from userid 110) id 0CC552083E; Mon, 22 Jan 2018 10:25:49 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id 1155520734; Mon, 22 Jan 2018 10:25:32 +0100 (CET) From: Maxime Ripard To: Chen-Yu Tsai , Maxime Ripard Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, narmstrong@baylibre.com, thomas@vitsch.nl Subject: [PATCH v4 07/13] drm/sun4i: engine: Create an atomic_begin callback Date: Mon, 22 Jan 2018 10:25:21 +0100 Message-Id: <44110951ae0cc13767fefc7fc1d9e2ec782d0a40.1516613040.git-series.maxime.ripard@free-electrons.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We have to implement some display engine specific behaviours in atomic_begin. Let's add a function for that. Reviewed-by: Chen-Yu Tsai Signed-off-by: Maxime Ripard --- drivers/gpu/drm/sun4i/sun4i_crtc.c | 6 +++++- drivers/gpu/drm/sun4i/sunxi_engine.h | 13 +++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) -- git-series 0.9.1 diff --git a/drivers/gpu/drm/sun4i/sun4i_crtc.c b/drivers/gpu/drm/sun4i/sun4i_crtc.c index 2a565325714f..f549f2874353 100644 --- a/drivers/gpu/drm/sun4i/sun4i_crtc.c +++ b/drivers/gpu/drm/sun4i/sun4i_crtc.c @@ -64,6 +64,7 @@ static void sun4i_crtc_atomic_begin(struct drm_crtc *crtc, { struct sun4i_crtc *scrtc = drm_crtc_to_sun4i_crtc(crtc); struct drm_device *dev = crtc->dev; + struct sunxi_engine *engine = scrtc->engine; unsigned long flags; if (crtc->state->event) { @@ -73,7 +74,10 @@ static void sun4i_crtc_atomic_begin(struct drm_crtc *crtc, scrtc->event = crtc->state->event; spin_unlock_irqrestore(&dev->event_lock, flags); crtc->state->event = NULL; - } + } + + if (engine->ops->atomic_begin) + engine->ops->atomic_begin(engine, old_state); } static void sun4i_crtc_atomic_flush(struct drm_crtc *crtc, diff --git a/drivers/gpu/drm/sun4i/sunxi_engine.h b/drivers/gpu/drm/sun4i/sunxi_engine.h index 54c029877531..baa7a1f95300 100644 --- a/drivers/gpu/drm/sun4i/sunxi_engine.h +++ b/drivers/gpu/drm/sun4i/sunxi_engine.h @@ -23,6 +23,19 @@ struct sunxi_engine; */ struct sunxi_engine_ops { /** + * @atomic_begin: + * + * This callback allows to prepare our engine for an atomic + * update. This is mirroring the + * &drm_crtc_helper_funcs.atomic_begin callback, so any + * documentation there applies. + * + * This function is optional. + */ + void (*atomic_begin)(struct sunxi_engine *engine, + struct drm_crtc_state *old_state); + + /** * @atomic_check: * * This callback allows to validate plane-update related CRTC