From: narmstrong@baylibre.com (Neil Armstrong)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 7/8] drm/sun4i: sun4i_layer: Add a custom atomic_check for the frontend
Date: Wed, 13 Dec 2017 17:12:20 +0100 [thread overview]
Message-ID: <c44a05e2-32e1-95f1-9d25-de6a0cd30e80@baylibre.com> (raw)
In-Reply-To: <4fbc349e2c3aa2efeadb55ea120c64b56c707cb4.1513178989.git-series.maxime.ripard@free-electrons.com>
On 13/12/2017 16:33, Maxime Ripard wrote:
> 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.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> drivers/gpu/drm/sun4i/sun4i_backend.c | 65 ++++++++++++++++++++++++++++-
> drivers/gpu/drm/sun4i/sun4i_backend.h | 2 +-
> 2 files changed, 67 insertions(+)
>
> diff --git a/drivers/gpu/drm/sun4i/sun4i_backend.c b/drivers/gpu/drm/sun4i/sun4i_backend.c
> index f1d19767c55d..a7b87a12990e 100644
> --- a/drivers/gpu/drm/sun4i/sun4i_backend.c
> +++ b/drivers/gpu/drm/sun4i/sun4i_backend.c
> @@ -11,6 +11,7 @@
> */
>
> #include <drm/drmP.h>
> +#include <drm/drm_atomic.h>
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_crtc.h>
> #include <drm/drm_crtc_helper.h>
> @@ -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 int sun4i_backend_init_sat(struct device *dev) {
> struct sun4i_backend *backend = dev_get_drvdata(dev);
> int ret;
> @@ -384,6 +448,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 636a51521e77..3b5531440fa3 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;
>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
next prev parent reply other threads:[~2017-12-13 16:12 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1513181781-0808628882.0a9bc10eb7@prakkezator.vehosting.nl>
2017-12-13 15:33 ` [PATCH 0/8] drm/sun4i: Support the Display Engine frontend Maxime Ripard
2017-12-13 15:33 ` [PATCH 1/8] drm/sun4i: backend: Move line stride setup to buffer setup function Maxime Ripard
2017-12-13 16:03 ` Neil Armstrong
2017-12-13 15:33 ` [PATCH 2/8] drm/sun4i: backend: Allow a NULL plane pointer to retrieve the format Maxime Ripard
2017-12-13 16:03 ` Neil Armstrong
2017-12-13 15:33 ` [PATCH 3/8] drm/sun4i: sun4i_layer: Add a custom plane state Maxime Ripard
2017-12-13 16:05 ` Neil Armstrong
2017-12-13 15:33 ` [PATCH 4/8] drm/sun4i: crtc: Add a custom crtc atomic_check Maxime Ripard
2017-12-13 16:06 ` Neil Armstrong
2017-12-13 15:33 ` [PATCH 5/8] drm/sun4i: Add a driver for the display frontend Maxime Ripard
2017-12-13 16:10 ` Neil Armstrong
2017-12-16 7:00 ` kbuild test robot
2017-12-13 15:33 ` [PATCH 6/8] drm/sun4i: sun4i_layer: Wire in the frontend Maxime Ripard
2017-12-13 16:11 ` Neil Armstrong
2017-12-13 16:23 ` Thomas van Kleef
2017-12-14 10:32 ` Maxime Ripard
2017-12-16 9:17 ` kbuild test robot
2017-12-13 15:33 ` [PATCH 7/8] drm/sun4i: sun4i_layer: Add a custom atomic_check for " Maxime Ripard
2017-12-13 16:12 ` Neil Armstrong [this message]
2017-12-13 15:33 ` [PATCH 8/8] ARM: dts: sun8i: a33 Enable our display frontend Maxime Ripard
2017-12-13 16:16 ` [PATCH 0/8] drm/sun4i: Support the Display Engine frontend Thomas van Kleef
2017-12-14 8:35 ` Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c44a05e2-32e1-95f1-9d25-de6a0cd30e80@baylibre.com \
--to=narmstrong@baylibre.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox