From patchwork Thu May 25 19:51:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 9749079 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E8C0C60246 for ; Thu, 25 May 2017 19:52:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D85D5283BA for ; Thu, 25 May 2017 19:52:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C9B77283C3; Thu, 25 May 2017 19:52:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5A51B283BA for ; Thu, 25 May 2017 19:52:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D6D8E6EACD; Thu, 25 May 2017 19:52:10 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt0-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by gabe.freedesktop.org (Postfix) with ESMTPS id C10616EAC3; Thu, 25 May 2017 19:52:04 +0000 (UTC) Received: by mail-qt0-f196.google.com with SMTP id j13so31530310qta.3; Thu, 25 May 2017 12:52:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bRESq2isVfXBDr7B7AlS5lFK7ATOyAFDMs4CEKGB03Q=; b=bpnkY4w9ny6ZUBzd+0egYIgrmX27DnTiXDTc3YzP0DJbbveLmKUlO7ssu4ZQeKfwwq GVZo8bd7drTdWGDUe2NXTuPgmh726WbB45VpdkVimMIxBlHz/32h4fgXUkib8321wf+t xNhipxvfabOxmJ6BJ3URWFAv87Etvku2IVap9jFSAqg07rpsIeSzgI7/nTjxB+iS3bKC tPQxTeYSOuO5qGjUBHaNHfdHPFYmjij0FvMxkHVzQCBrBjoCJ1byiNdqHCrcSiZP9Lk1 QSMHuseZIUao5Czr4WLuuzF6SG6QMcz/I7zfq/OGJPdowX8TT4XcoqRhUFOgLgPHJm1o T8OQ== X-Gm-Message-State: AODbwcDLWmJXtVKDIILXwEuxky+O2wW4/dTTJqUpH/1mffDrHxQ+0avJ OmfpaiVdLEsErTYPZLA= X-Received: by 10.200.39.93 with SMTP id h29mr43745148qth.76.1495741923690; Thu, 25 May 2017 12:52:03 -0700 (PDT) Received: from localhost.localdomain ([177.9.53.148]) by smtp.gmail.com with ESMTPSA id k36sm5156427qte.65.2017.05.25.12.52.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 May 2017 12:52:03 -0700 (PDT) From: Gustavo Padovan To: dri-devel@lists.freedesktop.org Subject: [PATCH RESEND 6/6] drm/vc4: update cursors asynchronously through atomic Date: Thu, 25 May 2017 16:51:44 -0300 Message-Id: <20170525195144.18134-7-gustavo@padovan.org> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170525195144.18134-1-gustavo@padovan.org> References: <20170525195144.18134-1-gustavo@padovan.org> MIME-Version: 1.0 Cc: Gustavo Padovan , intel-gfx@lists.freedesktop.org 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Gustavo Padovan Add support to async updates of cursors by using the new atomic interface for that. Basically what this commit does is do what vc4_update_plane() did but through atomic. v3: move size checks back to drivers (Ville Syrjälä) v2: move fb setting to core and use new state (Eric Anholt) Cc: Eric Anholt Signed-off-by: Gustavo Padovan Tested-by: Robert Foss --- drivers/gpu/drm/vc4/vc4_plane.c | 99 +++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 64 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index d34cd53..05e9f5f 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -735,70 +735,38 @@ void vc4_plane_async_set_fb(struct drm_plane *plane, struct drm_framebuffer *fb) vc4_state->dlist[vc4_state->ptr0_offset] = addr; } -static const struct drm_plane_helper_funcs vc4_plane_helper_funcs = { - .atomic_check = vc4_plane_atomic_check, - .atomic_update = vc4_plane_atomic_update, -}; - -static void vc4_plane_destroy(struct drm_plane *plane) -{ - drm_plane_helper_disable(plane); - drm_plane_cleanup(plane); -} - -/* Implements immediate (non-vblank-synced) updates of the cursor - * position, or falls back to the atomic helper otherwise. - */ -static int -vc4_update_plane(struct drm_plane *plane, - struct drm_crtc *crtc, - struct drm_framebuffer *fb, - int crtc_x, int crtc_y, - unsigned int crtc_w, unsigned int crtc_h, - uint32_t src_x, uint32_t src_y, - uint32_t src_w, uint32_t src_h, - struct drm_modeset_acquire_ctx *ctx) +static int vc4_plane_atomic_async_check(struct drm_plane *plane, + struct drm_plane_state *state) { - struct drm_plane_state *plane_state; - struct vc4_plane_state *vc4_state; - - if (plane != crtc->cursor) - goto out; - - plane_state = plane->state; - vc4_state = to_vc4_plane_state(plane_state); + if (plane != state->crtc->cursor) + return -EINVAL; - if (!plane_state) - goto out; + if (!plane->state) + return -EINVAL; /* No configuring new scaling in the fast path. */ - if (crtc_w != plane_state->crtc_w || - crtc_h != plane_state->crtc_h || - src_w != plane_state->src_w || - src_h != plane_state->src_h) { - goto out; + if (state->crtc_w != plane->state->crtc_w || + state->crtc_h != plane->state->crtc_h || + state->src_w != plane->state->src_w || + state->src_h != plane->state->src_h) { + return -EINVAL; } - if (fb != plane_state->fb) { - drm_atomic_set_fb_for_plane(plane->state, fb); - vc4_plane_async_set_fb(plane, fb); - } + return 0; +} - /* Set the cursor's position on the screen. This is the - * expected change from the drm_mode_cursor_universal() - * helper. - */ - plane_state->crtc_x = crtc_x; - plane_state->crtc_y = crtc_y; +static void vc4_plane_atomic_async_update(struct drm_plane *plane, + struct drm_plane_state *new_state) +{ + struct vc4_plane_state *vc4_state = to_vc4_plane_state(plane->state); - /* Allow changing the start position within the cursor BO, if - * that matters. - */ - plane_state->src_x = src_x; - plane_state->src_y = src_y; + plane->state->src_x = new_state->src_x; + plane->state->src_y = new_state->src_y; + plane->state->crtc_x = new_state->crtc_x; + plane->state->crtc_y = new_state->crtc_y; - /* Update the display list based on the new crtc_x/y. */ - vc4_plane_atomic_check(plane, plane_state); + if (plane->state->fb != new_state->fb) + vc4_plane_async_set_fb(plane, new_state->fb); /* Note that we can't just call vc4_plane_write_dlist() * because that would smash the context data that the HVS is @@ -810,20 +778,23 @@ vc4_update_plane(struct drm_plane *plane, &vc4_state->hw_dlist[vc4_state->pos2_offset]); writel(vc4_state->dlist[vc4_state->ptr0_offset], &vc4_state->hw_dlist[vc4_state->ptr0_offset]); +} - return 0; +static const struct drm_plane_helper_funcs vc4_plane_helper_funcs = { + .atomic_check = vc4_plane_atomic_check, + .atomic_update = vc4_plane_atomic_update, + .atomic_async_check = vc4_plane_atomic_async_check, + .atomic_async_update = vc4_plane_atomic_async_update, +}; -out: - return drm_atomic_helper_update_plane(plane, crtc, fb, - crtc_x, crtc_y, - crtc_w, crtc_h, - src_x, src_y, - src_w, src_h, - ctx); +static void vc4_plane_destroy(struct drm_plane *plane) +{ + drm_plane_helper_disable(plane); + drm_plane_cleanup(plane); } static const struct drm_plane_funcs vc4_plane_funcs = { - .update_plane = vc4_update_plane, + .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane, .destroy = vc4_plane_destroy, .set_property = NULL,