From patchwork Tue Jan 9 10:09:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 123852 Delivered-To: patch@linaro.org Received: by 10.80.140.226 with SMTP id r31csp266528edr; Tue, 9 Jan 2018 02:10:08 -0800 (PST) X-Google-Smtp-Source: ACJfBou6q5k1S4EWFN0+inu7dtFPuhLFhCLyb4YyfT0M/uQv+HIZUEnyZ/CB5pkohdqraNjG7lEP X-Received: by 10.101.69.137 with SMTP id o9mr11679188pgq.34.1515492607936; Tue, 09 Jan 2018 02:10:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515492607; cv=none; d=google.com; s=arc-20160816; b=eAyZwaTAI74UEorIvK8QVIiNTIyXwRfLxENreU2SVUiQDxBn5Yb9hDVEdyvqtwtQk9 m4Iq2lpTYX0KVnyzyEZwFXrJYCHAG8SK5p7cPaGLziQrDkzKUISX2JbbvNJvWktFJNuz 09p4LchwLut8oiX+ultY3icgWXJPWTSGoQGXtUu8t6u3wu5ZX7i9oME3h9RQz/xPyZz3 0QPIV0AjSjZmFnzwYPVHaLXeMVQZx7+45SKzOr8Orw55Zf6VXB94BIfG+JZsqhQLJgHf BM44yQiznNIA/6ZpNHPiWpCUcPw9i8zyU50GtpgbjttpguMOn0el9ahCTYnylmn7aQFY nOVw== 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=QwACCAZrqE6t4vKLT/6sPtLsb1NGV/3AraJwUJi43JQ=; b=1AvGWoyJQIAP235RWpfqXX4kuwI4qhgMg79FemEziAmcub+mO71w6++PNxXKyVsXQj YvUJ4ToN984gfGeoAtN6CoVgHnOsL3vsGJwUS2R6TxkgJ/Ts0XUnGBTxqgTClPhi0BXN 7AhOVIpDKh9P5OOhtk3KprkcWJOBPaUNdmuZXqsCnRjBEFKJx3GGsyCAzmm9wjJyE+FT 7tJYU0vCSPhfvi6dP3Wj2UXkFHcz50OCStV+74/3qeAQCxVUKSF4kqZTal3M82kThbn6 J6i/HYWkLrKr6jcPI69y9hoiWslbBX3OAYcgz+7H0s06f/Ors66zxZXkCWDNSRFnQIQx oa3Q== 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 bd12si10145313plb.694.2018.01.09.02.10.07; Tue, 09 Jan 2018 02:10:07 -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 S1753937AbeAIKKF (ORCPT + 28 others); Tue, 9 Jan 2018 05:10:05 -0500 Received: from mail.free-electrons.com ([62.4.15.54]:48499 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753586AbeAIKJx (ORCPT ); Tue, 9 Jan 2018 05:09:53 -0500 Received: by mail.free-electrons.com (Postfix, from userid 110) id 2FCBA207C8; Tue, 9 Jan 2018 11:09:50 +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 BF3E3207CA; Tue, 9 Jan 2018 11:09:33 +0100 (CET) From: Maxime Ripard To: Daniel Vetter , David Airlie , Chen-Yu Tsai , Maxime Ripard Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Thomas Petazzoni , narmstrong@baylibre.com, thomas@vitsch.nl Subject: [PATCH v3 10/13] drm/sun4i: backend: Add a custom atomic_check for the frontend Date: Tue, 9 Jan 2018 11:09:23 +0100 Message-Id: <75b809cc06839a5d16829297820755f35b005ecf.1515492513.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 Now that we have everything in place, we can start enabling the frontend. This is more difficult than one would assume since there can only be one plane using the frontend per-backend. We therefore need to make sure that the userspace will not try to setup multiple planes using it, since that would be impossible. In order to prevent that, we can create an atomic_check callback that will check that only one plane will effectively make use of the frontend in a given configuration, and will toggle the switch in that plane state so that the proper setup function can do their role. Reviewed-by: Chen-Yu Tsai Reviewed-by: Neil Armstrong Signed-off-by: Maxime Ripard --- drivers/gpu/drm/sun4i/sun4i_backend.c | 65 ++++++++++++++++++++++++++++- drivers/gpu/drm/sun4i/sun4i_backend.h | 2 +- 2 files changed, 67 insertions(+) -- git-series 0.9.1 diff --git a/drivers/gpu/drm/sun4i/sun4i_backend.c b/drivers/gpu/drm/sun4i/sun4i_backend.c index 29e1ca7e01fe..4642f933765e 100644 --- a/drivers/gpu/drm/sun4i/sun4i_backend.c +++ b/drivers/gpu/drm/sun4i/sun4i_backend.c @@ -11,6 +11,7 @@ */ #include +#include #include #include #include @@ -271,6 +272,69 @@ int sun4i_backend_update_layer_buffer(struct sun4i_backend *backend, return 0; } +static bool sun4i_backend_plane_uses_scaler(struct drm_plane_state *state) +{ + u16 src_h = state->src_h >> 16; + u16 src_w = state->src_w >> 16; + + DRM_DEBUG_DRIVER("Input size %dx%d, output size %dx%d\n", + src_w, src_h, state->crtc_w, state->crtc_h); + + if ((state->crtc_h != src_h) || (state->crtc_w != src_w)) + return true; + + return false; +} + +static bool sun4i_backend_plane_uses_frontend(struct drm_plane_state *state) +{ + struct sun4i_layer *layer = plane_to_sun4i_layer(state->plane); + struct sun4i_backend *backend = layer->backend; + + if (IS_ERR(backend->frontend)) + return false; + + return sun4i_backend_plane_uses_scaler(state); +} + +static int sun4i_backend_atomic_check(struct sunxi_engine *engine, + struct drm_crtc_state *crtc_state) +{ + struct drm_atomic_state *state = crtc_state->state; + struct drm_device *drm = state->dev; + struct drm_plane *plane; + unsigned int num_frontend_planes = 0; + + DRM_DEBUG_DRIVER("Starting checking our planes\n"); + + if (!crtc_state->planes_changed) + return 0; + + drm_for_each_plane_mask(plane, drm, crtc_state->plane_mask) { + struct drm_plane_state *plane_state = + drm_atomic_get_plane_state(state, plane); + struct sun4i_layer_state *layer_state = + state_to_sun4i_layer_state(plane_state); + + if (sun4i_backend_plane_uses_frontend(plane_state)) { + DRM_DEBUG_DRIVER("Using the frontend for plane %d\n", + plane->index); + + layer_state->uses_frontend = true; + num_frontend_planes++; + } else { + layer_state->uses_frontend = false; + } + } + + if (num_frontend_planes > SUN4I_BACKEND_NUM_FRONTEND_LAYERS) { + DRM_DEBUG_DRIVER("Too many planes going through the frontend, rejecting\n"); + return -EINVAL; + } + + return 0; +} + static void sun4i_backend_vblank_quirk(struct sunxi_engine *engine) { struct sun4i_backend *backend = engine_to_sun4i_backend(engine); @@ -414,6 +478,7 @@ static struct sun4i_frontend *sun4i_backend_find_frontend(struct sun4i_drv *drv, } static const struct sunxi_engine_ops sun4i_backend_engine_ops = { + .atomic_check = sun4i_backend_atomic_check, .commit = sun4i_backend_commit, .layers_init = sun4i_layers_init, .apply_color_correction = sun4i_backend_apply_color_correction, diff --git a/drivers/gpu/drm/sun4i/sun4i_backend.h b/drivers/gpu/drm/sun4i/sun4i_backend.h index 350a2dbde31a..b5edf2d50a24 100644 --- a/drivers/gpu/drm/sun4i/sun4i_backend.h +++ b/drivers/gpu/drm/sun4i/sun4i_backend.h @@ -144,6 +144,8 @@ #define SUN4I_BACKEND_HWCCOLORTAB_OFF 0x4c00 #define SUN4I_BACKEND_PIPE_OFF(p) (0x5000 + (0x400 * (p))) +#define SUN4I_BACKEND_NUM_FRONTEND_LAYERS 1 + struct sun4i_backend { struct sunxi_engine engine; struct sun4i_frontend *frontend;