From patchwork Mon Dec 18 14:57:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 122220 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2936237qgn; Mon, 18 Dec 2017 06:58:16 -0800 (PST) X-Google-Smtp-Source: ACJfBosHL+8frtJvsvWntxmA6d0vYKPIDOzTpOXKcEfMI76cSdvFvvM8BGDYSy8iwaThqmqLw9ay X-Received: by 10.84.133.41 with SMTP id 38mr93898plf.427.1513609096397; Mon, 18 Dec 2017 06:58:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513609096; cv=none; d=google.com; s=arc-20160816; b=OUkF7chQ8WjOFGP0peenIczEdnV+yuELxuhPFzWgB6NSjQPRn2Fh9RPKdzkPhGO5b6 o00jZzfX1AzFPNS6UC5oNUwc1n19Uq1Ne+9ybCRFRfHWfgeH3sJeQJBVnhIher7fmjiK nbcWvDAJg2ncT+dAjCr07M6UWUfQE1zUDzAnvzRzPkF6a8cKnzJFZCG0jhipenQv3JDO cRto1xvtl6qXau6F5MylKJMV0NoVKzRX4N/g84T6/K+sLCGsppJ79gdpcH3zs3t07q/f Eqwrd6DJjd6DbCEgI6i0k4HYsoHVVnN8idp/XtEtSd/EFH+K0sCZToN6N0KbPuCAuNPo /gqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:cc:references:in-reply-to:references:in-reply-to :message-id:date:subject:to:from:delivered-to :arc-authentication-results; bh=SEA52NtdZFStD04osxTuqwYU1LnbQAi9b423grkwUEU=; b=it9N5+3mNcccuyMHjEtZ8am6bfc/3fK8FruRSNGZnZwgUMxbtkVi/SDqwsPap5Ywk1 A3oz6Oh79eWfLO0cLKtJbbpQ9a5at9JlIzZuewt4zVraMklEgZ/VZPUMCYulaUZV4nsq K5K9tqnWEBM1JT/+Fr7V5ixD34G76vnm2ucvfmx8KrMeBI2KIrx6zobd7w0ECbS1Ndzv xXpjaE3VzRIEGaAi/efQDKOZBapXmDUipmu/gweMXzmnrqBjLo1b+NiZrcb04s8yog3N mg9i/D3O9Ry7sVelD9u/mV7yzS1QeQ0vWy+fiZWG20XSbrSUYQqOHQuJh6bKSiOgp9Wi zb9A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id z19si8521466pgv.738.2017.12.18.06.58.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Dec 2017 06:58:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 14FA789D89; Mon, 18 Dec 2017 14:58:09 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54]) by gabe.freedesktop.org (Postfix) with ESMTP id ECFF989BC2 for ; Mon, 18 Dec 2017 14:58:05 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id AF9F1206A6; Mon, 18 Dec 2017 15:58:04 +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 831AD20378; Mon, 18 Dec 2017 15:58:04 +0100 (CET) From: Maxime Ripard To: Daniel Vetter , David Airlie , Chen-Yu Tsai , Maxime Ripard Subject: [PATCH v2 04/12] drm/sun4i: engine: Add a custom crtc atomic_check Date: Mon, 18 Dec 2017 15:57:51 +0100 Message-Id: <4f7f9c265cbef5f06e3d97d30c1c5f3b3f9aae33.1513609024.git-series.maxime.ripard@free-electrons.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: References: In-Reply-To: References: Cc: Thomas Petazzoni , narmstrong@baylibre.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, thomas@vitsch.nl X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" We have some restrictions on what the planes and CRTC can provide that are tied to only one generation of display engines. For example, on the first generation, we can only have one YUV plane or one plane that uses the frontend output. Let's allow our engines to provide an atomic_check callback to validate the current configuration. Reviewed-by: Neil Armstrong Signed-off-by: Maxime Ripard --- drivers/gpu/drm/sun4i/sun4i_crtc.c | 14 ++++++++++++++ drivers/gpu/drm/sun4i/sunxi_engine.h | 17 +++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/drivers/gpu/drm/sun4i/sun4i_crtc.c b/drivers/gpu/drm/sun4i/sun4i_crtc.c index 5decae0069d0..2a565325714f 100644 --- a/drivers/gpu/drm/sun4i/sun4i_crtc.c +++ b/drivers/gpu/drm/sun4i/sun4i_crtc.c @@ -46,6 +46,19 @@ static struct drm_encoder *sun4i_crtc_get_encoder(struct drm_crtc *crtc) return NULL; } +static int sun4i_crtc_atomic_check(struct drm_crtc *crtc, + struct drm_crtc_state *state) +{ + struct sun4i_crtc *scrtc = drm_crtc_to_sun4i_crtc(crtc); + struct sunxi_engine *engine = scrtc->engine; + int ret = 0; + + if (engine && engine->ops && engine->ops->atomic_check) + ret = engine->ops->atomic_check(engine, state); + + return ret; +} + static void sun4i_crtc_atomic_begin(struct drm_crtc *crtc, struct drm_crtc_state *old_state) { @@ -125,6 +138,7 @@ static void sun4i_crtc_mode_set_nofb(struct drm_crtc *crtc) } static const struct drm_crtc_helper_funcs sun4i_crtc_helper_funcs = { + .atomic_check = sun4i_crtc_atomic_check, .atomic_begin = sun4i_crtc_atomic_begin, .atomic_flush = sun4i_crtc_atomic_flush, .atomic_enable = sun4i_crtc_atomic_enable, diff --git a/drivers/gpu/drm/sun4i/sunxi_engine.h b/drivers/gpu/drm/sun4i/sunxi_engine.h index 36c8388b1646..da2dd36dfbb6 100644 --- a/drivers/gpu/drm/sun4i/sunxi_engine.h +++ b/drivers/gpu/drm/sun4i/sunxi_engine.h @@ -33,6 +33,23 @@ struct sunxi_engine_ops { void (*apply_color_correction)(struct sunxi_engine *engine); /** + * @atomic_check: + * + * This callback allows to validate plane-update related CRTC + * constraints specific to backends. This is mirroring the + * &drm_crtc_helper_funcs.atomic_check callback, so any + * documentation there applies. + * + * This function is optional. + * + * RETURNS: + * + * 0 on success or a negative error code. + */ + int (*atomic_check)(struct sunxi_engine *engine, + struct drm_crtc_state *state); + + /** * @commit: * * This callback will trigger the hardware switch to commit