From patchwork Tue Jan 9 10:56:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 123869 Delivered-To: patch@linaro.org Received: by 10.80.140.226 with SMTP id r31csp305499edr; Tue, 9 Jan 2018 02:57:01 -0800 (PST) X-Google-Smtp-Source: ACJfBotH6aiGg2u/EtH5/Jxqt5CKbPdpI7uGYqzwCo7kg9iNSUXE6SwA2vP4+FvbEvonea/JCYFy X-Received: by 10.98.11.130 with SMTP id 2mr6787039pfl.190.1515495421145; Tue, 09 Jan 2018 02:57:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515495421; cv=none; d=google.com; s=arc-20160816; b=XtwcB5S9SHswzloD3YRfaPh66dt2ehAF+HWpzM1AMFL9Ir1IIlTiq5aQHtmU3GrFEU +/uMRouXMIr8Roa+4mEr0uzv47W4mfermGp4vNDi6/QUDZU8m55YJy/Oie9XntEEqx6k qvUTX8xwH9UDzhCzKfy4p5zEoKP+dEok42dFxRagDaquAhzTVfD028pTo9UmC1f46Zxb zlLtnYznqy5aPnxlrCbD9yTg+vhBDczjMmRzmhUtIdnN3NUxwM1KUb9JCQZFIvuhUvnN FDYY6p4dF3NLFrBaEKrqHvwGckYp0IbXwtBTGyzoo6izb2dEsku1zZbjeE+scWDjjzJY BsQg== 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=eJ2yt85OclTIAUExgZwTRTosvgTYRmatAqg7L7zldDY=; b=uDMcVp5MHgfA9DzO0VFEszQsRRBFpKkzipLqf13HnClfraaZhdaKKfb3zJrwDu/DIU 4uL6x06Y2/L9fFFJJD24VzwqduuomHxmju6qoD+irChs1uxh5J6xGOZjZsytCyS4qazu yOFNYqAaIKBJiZKwqh5rZXG9wSyoB/v6bJRNbHX7OAWy7Ppk8vSOkNoExuW0FwooVvgp TkKwwl52SvusfIGqUQrCbPhSgMSkPRUoNp5irN223YfuyopqWuW4EBpQUafpYf+D6UX4 RQcvXvTsBJEvuW82O4kXcMr+6zIhXogFz85rtckq02VmoFV4t2RpWJ89Q2U/vgKjOfeI /fSg== 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 q13si1206480pgp.262.2018.01.09.02.57.00; Tue, 09 Jan 2018 02:57:01 -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 S932139AbeAIK47 (ORCPT + 28 others); Tue, 9 Jan 2018 05:56:59 -0500 Received: from mail.free-electrons.com ([62.4.15.54]:50862 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754118AbeAIK4x (ORCPT ); Tue, 9 Jan 2018 05:56:53 -0500 Received: by mail.free-electrons.com (Postfix, from userid 110) id D52AE2099A; Tue, 9 Jan 2018 11:56:51 +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 8F2B1203B4; Tue, 9 Jan 2018 11:56:41 +0100 (CET) From: Maxime Ripard To: Chen-Yu Tsai , Maxime Ripard , Daniel Vetter , Jani Nikula , Sean Paul Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Thomas Petazzoni , thomas@vitsch.nl Subject: [PATCH 11/19] drm/sun4i: framebuffer: Add a custom atomic_check Date: Tue, 9 Jan 2018 11:56:30 +0100 Message-Id: <74cd1157b24d511b8e81a256c9b029d64558d61d.1515494838.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 In order to support normalized zpos, we need to call drm_atomic_normalize_zpos in our driver's drm_mode_config_funcs' atomic_check. Let's duplicate the definition of drm_atomic_helper_check for now. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) -- git-series 0.9.1 diff --git a/drivers/gpu/drm/sun4i/sun4i_framebuffer.c b/drivers/gpu/drm/sun4i/sun4i_framebuffer.c index a01a5b7d46e6..e68004844abe 100644 --- a/drivers/gpu/drm/sun4i/sun4i_framebuffer.c +++ b/drivers/gpu/drm/sun4i/sun4i_framebuffer.c @@ -26,9 +26,21 @@ static void sun4i_de_output_poll_changed(struct drm_device *drm) drm_fbdev_cma_hotplug_event(drv->fbdev); } +static int sun4i_de_atomic_check(struct drm_device *dev, + struct drm_atomic_state *state) +{ + int ret; + + ret = drm_atomic_helper_check_modeset(dev, state); + if (ret) + return ret; + + return drm_atomic_helper_check_planes(dev, state); +} + static const struct drm_mode_config_funcs sun4i_de_mode_config_funcs = { .output_poll_changed = sun4i_de_output_poll_changed, - .atomic_check = drm_atomic_helper_check, + .atomic_check = sun4i_de_atomic_check, .atomic_commit = drm_atomic_helper_commit, .fb_create = drm_gem_fb_create, };